Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactors intercom code to not process , adds signals for area power changes and area apc deletion , removes .src from fire alarm code #6097

Merged
merged 7 commits into from
May 7, 2021

Conversation

MLGTASTICa
Copy link
Contributor

@MLGTASTICa MLGTASTICa commented Apr 18, 2021

About The Pull Request

Removes process() from intercoms , now they work based on signals , add a signal for when the APC of an area is deleted, and for when a power change on an area is called, firealarms no longer do src.time which would result in src.src.time on compile
adresses #4537 by a bit.

Why It's Good For The Game

190 less objects to process overall , bad code removal , signals good.

Changelog

🆑
code: added signals for APC power change, and APC deletion for areas.
refactor: refactored intercom code to not process and instead use signals
/:cl:

code/game/machinery/alarm.dm Outdated Show resolved Hide resolved
code/game/objects/items/devices/radio/intercom.dm Outdated Show resolved Hide resolved
code/game/objects/items/devices/radio/intercom.dm Outdated Show resolved Hide resolved
Evankhell561
Evankhell561 previously approved these changes Apr 24, 2021
@Firefox13 Firefox13 merged commit 4491ca1 into discordia-space:master May 7, 2021
github-actions bot pushed a commit that referenced this pull request May 7, 2021
Spircen added a commit to Helixis/CEV-Eris that referenced this pull request May 24, 2021
* Most mobs can be mind-swapped (discordia-space#6104)

* Update mindswapper.dm

* fix

* Update mindswapper.dm

* adds suggestions

from Evankhell561

* Automatic changelog generation for PR discordia-space#6088 [ci skip]

* Automatic changelog generation for PR discordia-space#6104 [ci skip]

* Refactors and fixes malf AI emergency forcefield , buffs emergency forcefield (discordia-space#6105)

* the commit

* Update emergency_shield.dm

* Update tree_manipulation.dm

* Update emergency_shield.dm

* Update code/modules/shieldgen/emergency_shield.dm

Co-authored-by: MLGTASTICa <[email protected]>
Co-authored-by: Firefox13 <[email protected]>

* Update zarya.dm (discordia-space#6116)

* Automatic changelog generation for PR discordia-space#6105 [ci skip]

* Automatic changelog generation for PR discordia-space#6116 [ci skip]

* Automatic changelog compile [ci skip]

* Fixes disappearing  AMR and reverse boltgun states (discordia-space#6117)

* Fixes dissapearing AMR and reverse boltgun states

* e

* Automatic changelog generation for PR discordia-space#6117 [ci skip]

* Automatic changelog compile [ci skip]

* Spear Banishment (discordia-space#6120)

* Automatic changelog generation for PR discordia-space#6120 [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Trade fixes (discordia-space#6118)

* Debuffing random autholathe disks in trade stations

* Belt fix + removing of spawner

* Update code/game/objects/random/spawner.dm

* Update code/game/objects/random/lathe_disks.dm

* Automatic changelog generation for PR discordia-space#6118 [ci skip]

* Fixes closets (discordia-space#6131)

* Automatic changelog generation for PR discordia-space#6131 [ci skip]

* Automatic changelog compile [ci skip]

* Lets you put tools in the suit slot. (discordia-space#6134)

* Automatic changelog generation for PR discordia-space#6134 [ci skip]

* Add chemical reaction for gold slime extract (discordia-space#6126)

* Add recipe for gold extract

* Reduce quantity from 3 to 2

* Automatic changelog generation for PR discordia-space#6126 [ci skip]

* Remove ladder cheese with slipping items, traps and mines (discordia-space#6123)

* Remove ladder cheese with slipping objects

* Remove cheese from stairs + Wet tiles

* Update cruciform.dm (discordia-space#6127)

* Automatic changelog generation for PR discordia-space#6123 [ci skip]

* Automatic changelog generation for PR discordia-space#6127 [ci skip]

* Spear is now craftable (discordia-space#6122)

* Spear is now craftable

STILL NEEDS BACK SPRITE, INHAND AND WIELDED

* new icons and le code

* newline

* Automatic changelog generation for PR discordia-space#6122 [ci skip]

* Remove NT pipes from biogenerator room (discordia-space#6119)

* Automatic changelog generation for PR discordia-space#6119 [ci skip]

* Holy vacuum cleaner (discordia-space#6113)

* Add holy vacuum cleaner

* Fix issues with vacuum

* Add vacuum design and examine verb

* Fix travis error

* Update code/game/objects/items/weapons/holyvacuum.dm

Co-authored-by: Firefox13 <[email protected]>

* Update code/game/objects/items/weapons/holyvacuum.dm

Co-authored-by: Firefox13 <[email protected]>

* Update code/game/objects/items/weapons/holyvacuum.dm

Co-authored-by: Firefox13 <[email protected]>

* Update code/game/objects/items/weapons/holyvacuum.dm

Co-authored-by: Firefox13 <[email protected]>

* Update code/game/objects/items/weapons/holyvacuum.dm

Co-authored-by: Firefox13 <[email protected]>

* Blacklist from standard spawning

* Add price tags

* Change name

* Remove code abomination

* Darker filthy biomatter

Co-authored-by: Firefox13 <[email protected]>

* Automatic changelog generation for PR discordia-space#6113 [ci skip]

* Update recipes.dm (discordia-space#6133)

Co-authored-by: MLGTASTICa <[email protected]>

* Automatic changelog generation for PR discordia-space#6133 [ci skip]

* Turns the AMR into the shitcoded snowflake gun it was always meant to be (discordia-space#5910)

* Does all the things

* Overpenetration

* attachies!

* attachies!

* it actually works now

* one more to go... ha ha

* commit die

* shitty ammo sprites

* break all the walls!

* go commit not alive

* now with even shittier, not working code!

* hell yes

* commit no

* commit finalisation

* I love conflicts

* conflict "solving"

* commit

* fix

* wall fix

* update wall

* what even is a newline

* makes it work

* less EMP power

* Automatic changelog generation for PR discordia-space#5910 [ci skip]

* a (discordia-space#6137)

* Automatic changelog generation for PR discordia-space#6137 [ci skip]

* removes floor stun from disarm and melee (discordia-space#6129)

* removes floor stun from disarm

* removes knockdown from melee and removes unused var

* Automatic changelog generation for PR discordia-space#6129 [ci skip]

* Replaces spare sols with the new IH AK. (discordia-space#6125)

* Automatic changelog generation for PR discordia-space#6125 [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Runtime fixes , changes to organ_get_efficiency , slime and species fixes (discordia-space#6140)

* aaa

* Update MMI.dm

* The fixes

* Update unsorted.dm

* leftover debug message

* other way around

* Update code/modules/mob/living/carbon/human/human.dm

Co-authored-by: Evankhell561 <[email protected]>

* Update code/modules/mob/living/carbon/human/human.dm

Co-authored-by: Evankhell561 <[email protected]>

Co-authored-by: MLGTASTICa <[email protected]>
Co-authored-by: Evankhell561 <[email protected]>

* Ossisine no longer paralyzes,  ossisine now has a 100% chance to fix bones. (discordia-space#6145)

* Update medicine.dm

* proper proc calls

Co-authored-by: MLGTASTICa <[email protected]>

* Automatic changelog generation for PR discordia-space#6145 [ci skip]

* Automatic changelog generation for PR discordia-space#6140 [ci skip]

* Reduces the maximum "lowkeyrandom" spawner price (discordia-space#6150)

* Update _spawner.dm

* Update purerandom.dm

* (Probably) better fix for the byond bug that plagues borers. (discordia-space#6153)

* dac

* ddd

* oops forgot to add this back in

* Update borer.dm

* Update borer_powers.dm

* Update borer_powers.dm

Co-authored-by: MLGTASTICa <[email protected]>

* cruciform energy fixes V4 (discordia-space#6154)

* Update cruciform.dm

* Update cruciform.dm

* Update cruciform.dm

* Update priest.dm

* Update obelisk.dm

* Update eotp.dm

* Automatic changelog generation for PR discordia-space#6150 [ci skip]

* Automatic changelog generation for PR discordia-space#6153 [ci skip]

* adds new tactical reload (discordia-space#6156)

* adds new tactical reload

* message in chat

* Automatic changelog generation for PR discordia-space#6154 [ci skip]

* Automatic changelog generation for PR discordia-space#6156 [ci skip]

* Captain resprite, sheath tweaks, officer's saber (discordia-space#6148)

* captain's saber and sheath tweaks

* damage up

* damage down

* captain stuff resprited

* brought old sprites back

* Erismed Part 3 : Pain (discordia-space#5915)

* PAIN SHOCK

* CULTURE SHOCK

* FUTURE SHOCK

* compile_fix_yourself

* hallos_unsnowflake_yourself

* useless broken bones occupy every open space inside your skull

* you_know_whats_going_on_every_day_every_night

* aiming

* everywhere_swear_you're_so_fixable

* upside_down_cross_on_the_jumbocode

* wait up, hold on

* blowing_shock_stage_off_my_palms

* Automatic changelog generation for PR discordia-space#6148 [ci skip]

* Automatic changelog generation for PR discordia-space#5915 [ci skip]

* removed wield requirement to pump (discordia-space#6160)

* Automatic changelog generation for PR discordia-space#6160 [ci skip]

* Adds the ability to butcher limbs/bodies for meat, and adds resprited ustensils. (discordia-space#6152)

* initial commit

* d

* ada

* d

* dddd

* d

* ll

* this check doesn't even work and im surprised i left it here

* fix silly mistake

* add awesome sprites

* Update kitchen.dmi

* Update kitchen.dmi

Co-authored-by: MLGTASTICa <[email protected]>

* IH now have a hammer (discordia-space#6141)

* IH_hammer

* fix

* Rename the hammer

* Update code/game/objects/items/weapons/tools/hammer.dm

Co-authored-by: Firefox13 <[email protected]>

* map_merge_and_on_suit

Co-authored-by: Firefox13 <[email protected]>

* Automatic changelog generation for PR discordia-space#6152 [ci skip]

* Adds the ability to shoot people near ladders from below/above (discordia-space#6046)

* initial commit for stuff

* oops forgot this

Co-authored-by: MLGTASTICa <[email protected]>

* Automatic changelog generation for PR discordia-space#6141 [ci skip]

* Automatic changelog generation for PR discordia-space#6046 [ci skip]

* Lets people break apart guns for gun parts (discordia-space#6130)

* the parts

* revert old edits

* forgot this oops

* Update code/modules/projectiles/gun.dm

Co-authored-by: Firefox13 <[email protected]>

* Update code/modules/projectiles/gun.dm

Co-authored-by: Firefox13 <[email protected]>

* Update code/modules/projectiles/gun.dm

Co-authored-by: Firefox13 <[email protected]>

* Update dallas.dm

* Update lmg.dm

* Update boltgun.dm

* Update gun.dm

* harm intent

* bonus tip

* make sky driver special

* Update boltgun.dm

Co-authored-by: MLGTASTICa <[email protected]>
Co-authored-by: Firefox13 <[email protected]>

* Automatic changelog generation for PR discordia-space#6130 [ci skip]

* Slime people changes (discordia-space#6146)

* initial commit

* silly me forgot this.

Co-authored-by: MLGTASTICa <[email protected]>

* Autolathe nerf (discordia-space#6147)

* autolathe_kill

* nanoforge_name_change

* fixes

* Automatic changelog generation for PR discordia-space#6147 [ci skip]

* fixes takeshi onsuit sprite (discordia-space#6162)

* fixes takeshi onsuit sprite

* better

* Automatic changelog generation for PR discordia-space#6162 [ci skip]

* Tiny wintermute buff. (discordia-space#6161)

* slight damage boost

* slight recoil reduction

* Automatic changelog generation for PR discordia-space#6161 [ci skip]

* Maintchem and vomit!  (discordia-space#6149)

* food has become much, much rarer

* Added more low_chance spawns, adjusted spawn rates, rotten maint food can now contain a variety of chemicals

* Automatic changelog generation for PR discordia-space#6149 [ci skip]

* Refactors intercom code to not process , adds signals for area power changes and area apc deletion , removes .src from fire alarm code (discordia-space#6097)

* proper branch

* Update code/game/machinery/alarm.dm

Co-authored-by: Evankhell561 <[email protected]>

* Update code/game/objects/items/devices/radio/intercom.dm

Co-authored-by: Evankhell561 <[email protected]>

* Update code/game/objects/items/devices/radio/intercom.dm

Co-authored-by: Evankhell561 <[email protected]>

* better code , fix for something i forgot.

* Update code/game/objects/items/devices/radio/intercom.dm

Co-authored-by: Evankhell561 <[email protected]>

Co-authored-by: MLGTASTICa <[email protected]>
Co-authored-by: Evankhell561 <[email protected]>

* Automatic changelog generation for PR discordia-space#6097 [ci skip]

* Injecting sugar in bad. (discordia-space#6155)

* injecting sugar in bad

* Added warning as requested

* Update code/modules/reagents/reagents/dispenser.dm

Co-authored-by: Firefox13 <[email protected]>

* Automatic changelog generation for PR discordia-space#6155 [ci skip]

* Clown box added (discordia-space#6164)

* Clown box added

* Update misc.dm

* Update misc.dm

* Automatic changelog generation for PR discordia-space#6164 [ci skip]

* Automatic changelog compile [ci skip]

* i added chem to food, but forgot to add the food (discordia-space#6166)

* Automatic changelog generation for PR discordia-space#6166 [ci skip]

* Automatic changelog compile [ci skip]

* slowdown_nerf_bugfix (discordia-space#6167)

* Automatic changelog generation for PR discordia-space#6167 [ci skip]

* Automatic changelog compile [ci skip]

* cap gloves (discordia-space#6186)

* fixes disappearing sprite issue (discordia-space#6187)

* Automatic changelog generation for PR discordia-space#6186 [ci skip]

* Automatic changelog generation for PR discordia-space#6187 [ci skip]

* Junk Tractor Beam (discordia-space#6089)

* Basis of junk field generation

* Add 21 by 21 chunk folder

* Continue implementation and add console

* Continue developing JTB

* Generation and cleanup working

* Working on warparound

* Switch to 5x5 and 25x25

* Add check for sentient signature

* Work on map chunks

* Add offset for more immersion

* Set edge on the outside of the junk field

* Continue fixing stuff

* Add dmi structure

* Add maps

* Refining stuff

* Cleaning

* Mapmerging chunks

* Add jtb console and pillars to eris map

* Fix issues

* Enable exoplanets again

* Prevent runtime and set cooldown

* Add progress bar to cooldown

* Better way to avoid the runtime

* Handle case of console deconstruction

* Tweak chunks to fix rotation issue

* Fix layer of pillar

* Fix placement of 25 by 25 chunks

* Add new map + Unformat other maps because that causes loading issue (don't ask why)

* Adjust some quantities

* Fix loading with proper map formating

* Automatic changelog generation for PR discordia-space#6089 [ci skip]

* Fixes map related thingies and adds railings to engineering (discordia-space#6168)

* updates da map

* fix railiong

* Re-enable autoresponse (discordia-space#6169)

* fo resprot (discordia-space#6171)

* Automatic changelog generation for PR discordia-space#6168 [ci skip]

* Automatic changelog generation for PR discordia-space#6169 [ci skip]

* Automatic changelog generation for PR discordia-space#6171 [ci skip]

* Adds lethal speedloader to civilian disk (discordia-space#6174)

Adds the .35 lethal speedloader to the FS .35 Civilian Pack

* Automatic changelog generation for PR discordia-space#6174 [ci skip]

* Fixes chem and tracking implants not showing up on the prisoner management console (discordia-space#6178)

Now chem and tracking implants can  actually be used instead of disappearing as soon as you leave the brig

* Automatic changelog generation for PR discordia-space#6178 [ci skip]

* .40 mags resprite (discordia-space#6172)

* .40 mags resprite

* practice ammo brought back

* Automatic changelog generation for PR discordia-space#6172 [ci skip]

* le light (discordia-space#6190)

* shield (discordia-space#6183)

* Automatic changelog generation for PR discordia-space#6190 [ci skip]

* Prying quality for IH Hammer (discordia-space#6184)

* Prying quality for IH Hammer

* QUALITY_PRYING = 1

* Automatic changelog generation for PR discordia-space#6183 [ci skip]

* stat and name changes (discordia-space#6188)

* Automatic changelog generation for PR discordia-space#6184 [ci skip]

* Bill Trustworthy's Discount Firearms and Enterprising Detritus (discordia-space#6165)

* Adds Bill Trustworthy's Discount Guns and Enterprising Detritus

* Adds sprites and mapping

* Update vending.dm

Removes unneeded comments

* Update code/game/machinery/vending.dm

* Update code/game/machinery/vending.dm

Co-authored-by: Firefox13 <[email protected]>

* Flashbangs now affect thermal users through walls. (discordia-space#6177)

* Update flashbang.dm

* bangless bang

* Update flashbang.dm

Co-authored-by: MLGTASTICa <[email protected]>

* Automatic changelog generation for PR discordia-space#6188 [ci skip]

* Automatic changelog generation for PR discordia-space#6165 [ci skip]

* Automatic changelog generation for PR discordia-space#6177 [ci skip]

* Update _CEV_Eris.dmm (discordia-space#6192)

* Adds the kovacs (discordia-space#6189)

* adds the kovacs

* lowered price

* added to normal vend list

* Update code/modules/projectiles/guns/projectile/battle_rifle/kovacs.dm

Co-authored-by: Firefox13 <[email protected]>

Co-authored-by: Firefox13 <[email protected]>

* Automatic changelog generation for PR discordia-space#6192 [ci skip]

* Automatic changelog generation for PR discordia-space#6189 [ci skip]

* Automatic changelog compile [ci skip]

* Hivemind tools maybe (discordia-space#6193)

* adds tools

* le comment

* tools

* I AM GOING FUCKING INSANE

* Is that a.. variable? OUHGHGHG IM GOING INSANE UHGHHGNGNHG

* le tool tech

* beaker and tech

* adds a funny beaker

* Update chemical.dmi

* DER POOPEN FARTEN

* new line and comment

* makes the datapad normal sized

* le perk

* le icon

* gives perk to the oddity and names it Hiveborn

* was added and removes the thing

* adds ceuvi's shitty fucking sprites so there ar eno merge conflicts if this doesnt work i will fucking scream into the void existence is pain

* SLIGHTIL MOVES THIS SHIT TO THE LEFT I PRAY THIS FUCKING WORKS IM GOING INSANE UGHGHAHGGAHGHGHGHG

* Faulty guns and you! (discordia-space#6191)

* faulty guns

* Higher chance for trash gun mod

* da (discordia-space#6185)

Co-authored-by: MLGTASTICa <[email protected]>

* Automatic changelog generation for PR discordia-space#6191 [ci skip]

* Automatic changelog generation for PR discordia-space#6185 [ci skip]

* Automatic changelog compile [ci skip]

* dada (discordia-space#6173)

Co-authored-by: MLGTASTICa <[email protected]>

* Automatic changelog generation for PR discordia-space#6173 [ci skip]

* billomat (discordia-space#6195)

* Automatic changelog generation for PR discordia-space#6195 [ci skip]

* Automatic changelog compile [ci skip]

* Update inventory.dm (discordia-space#6202)

Co-authored-by: MLGTASTICa <[email protected]>

* Automatic changelog generation for PR discordia-space#6202 [ci skip]

* Automatic changelog compile [ci skip]

* Fix coolant tank runtime (discordia-space#6217)

* Automatic changelog generation for PR discordia-space#6217 [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* changes food sprites (discordia-space#6200)

* changes food sprites

* sausig

* Automatic changelog generation for PR discordia-space#6200 [ci skip]

* Shield with signals (discordia-space#6207)

* Automatic changelog generation for PR discordia-space#6207 [ci skip]

* Update portals.dm (discordia-space#6211)

* Automatic changelog generation for PR discordia-space#6211 [ci skip]

* removes health_deficiency (discordia-space#6213)

* arachnophobia (discordia-space#6214)

* Automatic changelog generation for PR discordia-space#6213 [ci skip]

* Add Tersus holy vacuum cleaner to custodian closet (discordia-space#6215)

* Automatic changelog generation for PR discordia-space#6214 [ci skip]

* Automatic changelog generation for PR discordia-space#6215 [ci skip]

* examining the bluespace gift now can give you an idea of how much entropy there is. (discordia-space#6222)

* bluespace gift

* Update oddities.dm

* Automatic changelog generation for PR discordia-space#6222 [ci skip]

* fixes propaganda chip and spy sesnsor origin tech (discordia-space#6226)

* fez (discordia-space#6227)

* Automatic changelog generation for PR discordia-space#6226 [ci skip]

* Automatic changelog generation for PR discordia-space#6227 [ci skip]

* The Divine Blessing ritual now reduces the stats of the performer. (discordia-space#6229)

* Update priest.dm

* Update priest.dm

* Update code/modules/core_implant/cruciform/rituals/priest.dm

Co-authored-by: Firefox13 <[email protected]>

Co-authored-by: Firefox13 <[email protected]>

* Automatic changelog generation for PR discordia-space#6229 [ci skip]

* Typo Fixes, for the seen, and unseen. (discordia-space#6199)

* Update contract.dm

* Update ion_storm.dm

* Update teleporter.dm

* Update tree_networking.dm

* turns station into 'CEV Eris'.

* announser to announcer, station announcement to ship announcement

* more typofixes

* resprited slimes (discordia-space#6205)

* no_nut (discordia-space#6196)

* Automatic changelog generation for PR discordia-space#6205 [ci skip]

* faster_knockout (discordia-space#6197)

* Automatic changelog generation for PR discordia-space#6196 [ci skip]

* oh man, I fixed a round-ending bug (discordia-space#6198)

* Automatic changelog generation for PR discordia-space#6197 [ci skip]

* Automatic changelog generation for PR discordia-space#6198 [ci skip]

* ready (discordia-space#6201)

* Automatic changelog generation for PR discordia-space#6201 [ci skip]

* Fuck parapen (discordia-space#6204)

* Fuck you parapen

* fixdatshit

* Kovacs tweaks (discordia-space#6209)

* Kovacs more expensive and rarer

* price adjustment

* removes the ERP

* Revert "removes the ERP"

This reverts commit 0da207a.

* Automatic changelog generation for PR discordia-space#6204 [ci skip]

* Automatic changelog generation for PR discordia-space#6209 [ci skip]

* the Cruciform sense no longer includes the ritual performer. (discordia-space#6219)

* Update base.dm

* Update base.dm

* Automatic changelog generation for PR discordia-space#6219 [ci skip]

* Organic buff: Makes limb HP separate from death. (discordia-space#6220)

* Allows organic limbs to compete with robotic ones.

* makes the groin a vital organ.

* Reverts groin being a vital area.

* Blacklist ballistic NVGs from spawning (discordia-space#6228)

* Update night.dm

* Update code/modules/clothing/glasses/night.dm

* Automatic changelog generation for PR discordia-space#6220 [ci skip]

* Automatic changelog generation for PR discordia-space#6228 [ci skip]

* dd (discordia-space#6230)

Co-authored-by: MLGTASTICa <[email protected]>

* Automatic changelog generation for PR discordia-space#6230 [ci skip]

* Automatic changelog compile [ci skip]

* Update church.dm (discordia-space#6236)

* Automatic changelog generation for PR discordia-space#6236 [ci skip]

* preacher (discordia-space#6233)

* Automatic changelog generation for PR discordia-space#6233 [ci skip]

* nt tweaks (discordia-space#6210)

* nt

* Update cruciform.dm

* Bunch of loadout tweaks: holsters, battle dress, et al (discordia-space#6216)

* Makes holster available to all jobs, increases cost

* increases cost

* makes holster more general

Co-authored-by: Firefox13 <[email protected]>

* Adds cigarettes and Battle Dress Uniforms

* adds oberth hat and gloves, ration pack

* newlines

* name consistency

* battle dress variants now properly work

* soviet uniform

* Adds jackboots, and gives medics the base navy beret

* gives medical beret

* Gives beret to correct job

* Fixing stuff for firefox

* newlines

* actual newlines

* adds fingerless gloves

Co-authored-by: Firefox13 <[email protected]>

* Automatic changelog generation for PR discordia-space#6210 [ci skip]

* Automatic changelog generation for PR discordia-space#6216 [ci skip]

* Properly tweaks EMP (discordia-space#6221)

* Automatic changelog generation for PR discordia-space#6221 [ci skip]

* Adds Slaught-o-Matic disk (discordia-space#6218)

* Adds Slaught-o-Matic disk and fixes code typos

* Changes points cost and vendor price

* Update code/game/objects/items/weapons/design_disks/frozen_star.dm

Co-authored-by: Firefox13 <[email protected]>

Co-authored-by: Firefox13 <[email protected]>

* Automatic changelog generation for PR discordia-space#6218 [ci skip]

* PAYDAY masks and suits to Bill Trustworthy's Discount Guns and Enterprising Detritus (discordia-space#6235)

* /// POLICE ASSAULT IN PROGRESS ///

* nitrile gloves to vendor

* NEWLINE and missing comma

* tuxedo to loadout

* price tweaks

* tuxedo

* Automatic changelog generation for PR discordia-space#6235 [ci skip]

* medkit_bugfix (discordia-space#6224)

* Automatic changelog generation for PR discordia-space#6224 [ci skip]

* kitchen storage, club maint access, cbt all around (discordia-space#6208)

* Automatic changelog generation for PR discordia-space#6208 [ci skip]

* guns! (discordia-space#6238)

* gun tweaks (discordia-space#6237)

* Automatic changelog generation for PR discordia-space#6238 [ci skip]

* Automatic changelog generation for PR discordia-space#6237 [ci skip]

* The fix (discordia-space#6240)

* Adds the Barrel fire, tweaks microwave code (discordia-space#6225)

* Adds the Barrel fire and its recipe

* Updates some of the progs

* Barrel moved down

* Renaming and crackling groundwork

* Added description

* newline added

* fix newline

* removes "broke" proc

* Rephrasing and removing Microwave breakage

* Update code/game/machinery/kitchen/microwave.dm

Co-authored-by: Firefox13 <[email protected]>

* Update code/datums/craft/recipes/furniture.dm

Co-authored-by: Firefox13 <[email protected]>

Co-authored-by: Firefox13 <[email protected]>

* Automatic changelog generation for PR discordia-space#6240 [ci skip]

* Syndicate softsuits Update (discordia-space#6234)

* Syndicate softsuits Update

* oops, forgot to update some icons

* Removed Extra versions and merge fix

* 2nd merge fix

* minor changes for firefox

* The error that was missed

* Update code/modules/clothing/spacesuits/miscellaneous.dm

Co-authored-by: Firefox13 <[email protected]>

* Automatic changelog generation for PR discordia-space#6225 [ci skip]

* Automatic changelog generation for PR discordia-space#6234 [ci skip]

* Buffs splints (and adds some cryobags to the minipharma) (discordia-space#6232)

* Splint changes

* I'm a retard.

* So much for BP_ALL_LIMBS.

* Test

* Revert "Test"

This reverts commit 9fba73a.

* More support for the extra limbs

* Gives the minipharma 4 sets of splints instead of 6

* Update vending.dm

* adds prices to wallmed

* Automatic changelog generation for PR discordia-space#6232 [ci skip]

* Multiz throwing (discordia-space#6151)

* Update carbon.dm

* 2

* Update carbon.dm

* the artist bench can now produce parts of guns and armor. (discordia-space#6223)

* tes1

* Update crafting_items.dm

* Automatic changelog generation for PR discordia-space#6151 [ci skip]

* Automatic changelog generation for PR discordia-space#6223 [ci skip]

* ddd (discordia-space#6231)

* Automatic changelog generation for PR discordia-space#6231 [ci skip]

* making evac pods great again (discordia-space#6241)

* Automatic changelog generation for PR discordia-space#6241 [ci skip]

* Rebalance Part 1, the doc (discordia-space#6203)

* Marshal badge and PK

* IS THAT AN ERROR?

* Price tweaks, cum and fix

* removes herobrine

* forgot this

* cum, i guess

* FIX

* No funny commit message becouse no inspiration

* ammo again

* slowdown

* More ammo tweaks

* IM GOING INSANE

* fixed a typo in fix and tweaked other prizes, also Manhacks

* Obviously i fuck up as always and need to fix

* tweaks the damage of EMP

* flash

* im the definition of retard

* whats the taste of a shotgun shell

* fixing some stuff

* fix 3

* fix again

* Un-sus your money

* Mounted Laser Cannon tweaks

* hardsuit voice and ewar

* fixing crap

* Reverting crap that i need to re-do

This reverts commit 93324db.

* fix attempt 1

* Visc requests

* price tweaks and donut buff

* test 1 in medkit stuff

* fix attempt

* fix two

* fix 3

* fix 4

* Fix again

* im high on crack

* genetic vial buff

* nanopaste

* fix nano

* E

* Revert "E"

This reverts commit cfb1934.

* Nanopaste but now it works

* More prize tweaks

* more ammo

* tweaking ammo

* fix

* Newlines.

* Revert "fix"

This reverts commit 50f18fc.

* Revert "tweaking ammo"

This reverts commit 0bac1ce.

* Revert "more ammo"

This reverts commit 970f652.

* Update code/game/antagonist/outer/blitzshell/blitzshell.dm

Co-authored-by: Firefox13 <[email protected]>

* Update code/modules/mob/living/simple_animal/hostile/syndicate.dm

Co-authored-by: Firefox13 <[email protected]>

* Update code/modules/reagents/reagent_containers/pill.dm

Co-authored-by: Firefox13 <[email protected]>

* Update code/datums/uplink/grenades.dm

Co-authored-by: Firefox13 <[email protected]>

* Update code/game/objects/items/weapons/storage/firstaid.dm

Co-authored-by: Firefox13 <[email protected]>

* Update code/datums/uplink/medical.dm

Co-authored-by: Firefox13 <[email protected]>

* Nukes capital letters

* Nukes capital letters

* Update code/game/objects/items/weapons/storage/firstaid.dm

Co-authored-by: Firefox13 <[email protected]>

* Update code/game/objects/items/weapons/storage/firstaid.dm

Co-authored-by: Firefox13 <[email protected]>

* Update code/datums/uplink/ammunition.dm

* Update code/datums/uplink/ammunition.dm

* Update code/datums/uplink/medical.dm

* Update code/datums/uplink/ammunition.dm

Co-authored-by: Firefox13 <[email protected]>

* Automatic changelog generation for PR discordia-space#6203 [ci skip]

* Update lamia.dm (discordia-space#6239)

* Automatic changelog generation for PR discordia-space#6239 [ci skip]

* lootbags, payday price tweaks (discordia-space#6242)

* Automatic changelog generation for PR discordia-space#6242 [ci skip]

* Finally (discordia-space#6244)

* Automatic changelog generation for PR discordia-space#6244 [ci skip]

* Automatic changelog compile [ci skip]

* Kovacs virus (discordia-space#6249)

* woops

* Update code/game/objects/items/weapons/design_disks/autolathe_disks.dm

Co-authored-by: Firefox13 <[email protected]>

* Barrel stays lit (discordia-space#6246)

* Automatic changelog generation for PR discordia-space#6249 [ci skip]

* Automatic changelog generation for PR discordia-space#6246 [ci skip]

* Automatic changelog compile [ci skip]

* No more chinese robots (discordia-space#6252)

* Automatic changelog generation for PR discordia-space#6252 [ci skip]

* Automatic changelog compile [ci skip]

* Includes Hispania

* Otro Include que olvide

Co-authored-by: Cocacola4124 <[email protected]>
Co-authored-by: Nestor Jr <[email protected]>
Co-authored-by: MLGTASTICa <[email protected]>
Co-authored-by: MLGTASTICa <[email protected]>
Co-authored-by: Firefox13 <[email protected]>
Co-authored-by: Jackofashepard <[email protected]>
Co-authored-by: Wouju <[email protected]>
Co-authored-by: AlexMorgan3817 <[email protected]>
Co-authored-by: Sparrowbird611 <[email protected]>
Co-authored-by: hyperioo <[email protected]>
Co-authored-by: Evankhell561 <[email protected]>
Co-authored-by: Alliostra <[email protected]>
Co-authored-by: CeUvi <[email protected]>
Co-authored-by: TheShown911 <[email protected]>
Co-authored-by: DarkLevelSS13 <[email protected]>
Co-authored-by: zombiemimic <[email protected]>
Co-authored-by: thedarkcrusader <[email protected]>
Co-authored-by: Xoxeyos <[email protected]>
Co-authored-by: L74814 <[email protected]>
Co-authored-by: AgentMA1 <[email protected]>
Co-authored-by: shazbot194 <[email protected]>
Co-authored-by: @everyone <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants