Commit Graph

236 Commits

Author SHA1 Message Date
Trilbyspaceclone 359d0e8531 Update lungs.dm 2019-07-23 01:27:03 -04:00
Ghommie 676186ee36 Ports "Removes some getflaticon calls from things that don't draw browser interfaces" 2019-07-16 23:15:52 +02:00
Ghommie 129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
kevinz000 1eaddd3ebf Merge pull request #8853 from Ghommie/Ghommie-cit125
Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"
2019-07-12 07:34:19 -07:00
Ghommie 490ae9daf2 Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant" 2019-07-09 07:58:22 +02:00
deathride58 e56fc559ed Merge pull request #8748 from Citadel-Station-13/kevinz000-patch-15
Raises corpse miasma generation by 5x. Lowers miasma disease chance per mole by 10x. Miasma now does absolutely nothing unless there's enough of it in the air to actually flow into scrubbers so there's no invisible pockets of disease stuck everywhere.
2019-07-08 18:15:20 -04:00
deathride58 42cee552fe Merge pull request #8709 from Trilbyspaceclone/Fel_port_1
Ports "Fixes every issue in the slimes milestone. #44450"
2019-07-08 18:10:46 -04:00
deathride58 840cfb8ac0 Merge pull request #8818 from Citadel-Station-13/kevinz000-patch-53
fixes stimulum by changing one number
2019-07-08 17:54:56 -04:00
kevinz000 1b4df74efb Merge pull request #8802 from Ghommie/Ghommie-cit101
Ports in RPGs for nuke ops, failsafe uplink codes, some carp plushie exploit fix etc.
2019-07-07 02:39:07 -07:00
kevinz000 8a4d7afca2 Update lungs.dm 2019-07-03 03:55:27 -07:00
Ghommie f39a5d2f6a Ports in RPGs for nuke ops, failsafe uplinks and some carp plushie exploit fix. 2019-06-30 21:53:33 +02:00
TrilbySpaceClone 9d6c930b2c owo
Wat dis?
2019-06-30 15:47:45 -04:00
kevinz000 c495a2aa47 Merge pull request #8739 from Sishen1542/makinggolemsgreatagain
Ports additional tg golem types! Leather, cardboard, bronze & bone. Ports bone hurting juice as well!
2019-06-28 20:32:15 -07:00
kevinz000 45842ebda7 Update lungs.dm 2019-06-25 01:38:26 -07:00
kevinz000 626ec64c1c Update lungs.dm 2019-06-25 01:34:19 -07:00
Ghom d4a13077ff ports in "Adds radial menu to arm-mounted implants" (#8733) 2019-06-23 06:01:09 -07:00
Sishen a2a440a92c golem gang golem gang golem gang golem gang 2019-06-23 04:27:50 -04:00
TrilbySpaseClone 771ac9724e ports Fel connet
Shamelessly stealing content
2019-06-21 04:39:10 -04:00
SkullyRoberts e83365daed Added a penis autosurgeon as rare maint loot 2019-06-08 17:12:51 -04:00
kevinz000 ab565d2483 Merge pull request #8547 from Ghommie/Ghommie-cit29
Moves traits to datums and turn the accessors into defines
2019-06-08 01:22:16 -07:00
deathride58 aa53cc9ea9 Merge branch 'master' into fuckatmos 2019-06-07 04:38:47 -04:00
Ghommie d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
deathride58 4fc31f6322 Merge branch 'master' into fuckatmos 2019-05-25 15:34:06 -04:00
Sishen d082479ccb Slimespeak! 2019-05-24 08:48:03 -04:00
Poojawa f95da1aae5 Heart Attacks will murder you now
Also sanity check for cursed heart overlay
2019-05-17 05:59:28 -05:00
deathride58 41375d9737 Increases performance significantly by turning garbage collection into a define 2019-04-14 11:33:28 -04:00
deathride58 2c9deab42e removes add_gas() and assert_gas(). next up: do further testing with garbage_collect() present and not present 2019-04-14 10:33:39 -04:00
deathride58 8b75240d89 fuck atmos - attempts to optimize atmos by removing GAS_META from the gas mixture meta list and removing the usage of gas archive 2019-04-11 17:07:11 -04:00
kevinz000 63dd18c790 Merge pull request #8180 from Trilbyspaceclone/Weebo
adds toy katana and lum eyes to load out - Requested by MrJWhite
2019-04-02 05:35:31 -07:00
Trilbyspaceclone 1dc121e407 Update autosurgeon.dm 2019-03-28 21:33:21 -04:00
Poojawa fbc2b15d21 Make sure the oxygen max doesn't do fucky things 2019-03-21 15:13:11 -05:00
Poojawa 0ffa3f6670 carbon Oxygen toxicity 2019-03-21 15:05:58 -05:00
Zargul 4574627250 Low plasma concentration does not damage anymore (#7977)
* Update lungs.dm

* Update lungs.dm

* Update lungs.dm
2019-02-08 02:11:02 -08:00
kiwedespars a876e985e7 adds bwoink and snap to vog
this isn't needed
adds heyo to orgasm words too.

however, man once thought of something really stupid, and man's contributor didn't want to do it, so man made it happen
2019-01-24 18:41:42 -08:00
deathride58 9f294f523e buffs and nerfs night vision trait 2018-11-30 20:36:27 -05:00
izzyinbox 172a46bcbe adds voice of god orgasm and dab commands (#7694) 2018-11-09 19:10:42 -08:00
Poojawa 99e57fb221 various citadel tweaks/fixes
remeber to add //citadel edit to base code changes because we're still a downstream and hard syncs are still a thing
2018-09-17 03:26:05 -05:00
Poojawa 284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
kevinz000 0bdf684933 Update augments_internal.dm 2018-08-24 23:28:06 -07:00
deathride58 3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58 b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
ShizCalev 4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
deathride58 2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
LetterJay c1aab03bb5 Merge branch 'master' into upstream-merge-37530 2018-05-22 07:19:06 -05:00
Nich 177139a1d3 Replace nauseous with nauseated (#37927) 2018-05-21 03:06:39 -05:00
XDTM ec3516ea19 [s] Hallucinations 4.0 2018-05-09 16:15:58 -05:00
Armhulen 04057dc7d6 Plasmamen organs GET sprites! (#37595)
* DONE

* initial

* Removes random slashes
2018-05-02 21:21:11 -05:00
kevinz000 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
vuonojenmustaturska ec2de88a65 Replaces HEALS_EARS_2 with a component, adds a wearertargeting parent component for future use 2018-04-29 17:32:12 -05:00
deathride58 62d64a8647 Merge pull request #6509 from Citadel-Station-13/upstream-merge-37402
[MIRROR] Fixes autosurgeon icon
2018-04-27 09:32:05 +00:00