shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,712 Commits 5 Branches 0 Tags
4c10c830bf94de5f41e8c06bca0de5a856ad46f4
Commit Graph

68 Commits

Author SHA1 Message Date
kevinz000
e4f6131dcf Update brain_item.dm 2020-02-13 01:51:16 -07:00
Ghommie
8de11845d5 Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable 2020-02-02 03:39:49 +01:00
kevinz000
b5ca546ac3 patch 2020-01-20 22:45:21 -07:00
Ghommie
e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
Ghommie
dd101ef221 Part 2 2019-11-19 18:00:56 +01:00
Ghommie
1e49ce76d3 Dreamchecker compatibility changes, part 1. 2019-11-10 20:48:30 +01:00
Fermi
7b2c8e58ff Fixes freezing and ghost rider 2019-10-14 13:23:39 +01:00
Ghommie
735755019e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-10-09 01:18:30 +02:00
Fermi
79e85e2cfa Fixes some runtimes 2019-10-04 03:53:02 +01:00
Fermi
553818504c Hoepfully fixes unwanted traumas in the dead. 2019-10-01 06:21:34 +01:00
Fermi
391af0f946 I have no idea why the brain doesn't decay, but this seems to fix it. 2019-09-28 07:26:59 +01:00
Fermi
d44fbd3fb1 Brain fix 2019-09-27 23:46:44 +01:00
Thalpy
1bdb66d5de Okay a few things I just saw 2019-09-27 07:28:02 +01:00
Fermi
107dd67cbe Well it compiles; just synthtissue and TongueLoss now. 2019-09-19 01:14:12 +01:00
Fermi
c23d6f0113 I missed an earlier port. 2019-09-17 01:08:37 +01:00
Ghommie
4df4cbd721 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-07-15 17:23:01 +02:00
Ghommie
a3ab5f6d23 Moving the snowflake mob var to the component and finalizing. 2019-07-04 02:03:51 +02:00
Ghommie
c58efa64c1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-07-03 02:36:23 +02:00
Ghommie
d93e63af53 we just want the trauma to be niche, not unachievable. 2019-06-28 23:21:10 +02:00
Ghommie
3cbe9cf6b0 componentization part 1: "The flawed theorical code" 2019-06-10 22:37:38 +02:00
Ghommie
0e630680ba forgot to pull from upstream. One second. 2019-06-06 15:20:27 +02:00
kevinz000
c9afcde51c Update brain_item.dm 2019-02-16 17:16:25 -08:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
ShizCalev
b5a95e9da8 Makes more messages pronoun sensitive 2018-05-03 17:46:25 -05:00
AnturK
1ba045e5f5 Fixes brain tumor. Again. (#37378) 2018-04-24 09:58:36 -05:00
vuonojenmustaturska
d2b4b6d2f0 Merge pull request #37214 from AnturK/imighthavebraindamage 
Fixes adjusting brain damage.
 2018-04-16 07:39:54 -05:00
YPOQ
1ee5b349d7 Fixes mannitol not curing minor brain traumas (#36645) 
* Fixes mannitol not curing brain traumas

* Makes has_trauma_type random, adds type arg to cure_trauma_type

* Adds get_traumas_type proc

* Default to /datum/brain_trauma
 2018-04-03 22:03:20 -05:00
CitadelStationBot
4ad2b2975a [MIRROR] Fixes some more trauma bugs (#6039) 
* Fixes some more trauma bugs (#36487)

* fixes some more trauma bugs

* Update brain_trauma.dm

* Update brain_item.dm

* Fixes some more trauma bugs
 2018-03-21 12:50:22 -05:00
CitadelStationBot
3d26cd4a6f [MIRROR] Replaced body zone magic strings with defines (#6004) 
* Replaced body zone magic strings with defines

* merge conflicts
 2018-03-19 21:18:57 -05:00
CitadelStationBot
0bf1f7ce14 [MIRROR] Refactors some trauma code, fixes some trauma heals not working (#5955) 
* Refactors some trauma code, fixes some trauma heals not working (#36093)

* Refactors some trauma code, fixes some trauma heals not working

* that too

* fix indent

* antur comments

* Refactors some trauma code, fixes some trauma heals not working
 2018-03-15 20:50:10 -05:00
XDTM
bd6e8f0bbb Adds limitations to brain traumas (#35938) 
* Adds limitations to brain damage

* no need for these anymore

* a bit harder to gain traumas if you have some already

* (
 2018-02-25 11:01:15 -06:00
CitadelStationBot
1e65c813f0 [MIRROR] Extensive surgery additions (#5590) 
* Extensive surgery additions

* Update role_preferences.dm

* Update surgery_step.dm
 2018-02-19 10:48:11 -06:00
CitadelStationBot
fb03783346 [MIRROR] Fixes changelings retaining fake brains on de-changelining (#5248) 
* Merge pull request #34872 from AnturK/theresabraininymyhead

Fixes changelings retaining fake brains on de-changelining

* Fixes changelings retaining fake brains on de-changelining
 2018-02-05 00:56:51 -06:00
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178) 
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
 2018-01-29 04:42:29 -06:00
YPO
f51fcc835f Fixes brains being left in hands after being inserted into heads 2018-01-26 02:59:12 -06:00
LetterJay
518b264654 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783 
# Conflicts:
#	_maps/map_files/generic/CentCom.dmm
#	code/modules/mob/living/living.dm
 2017-12-29 01:34:17 -06:00
LetterJay
8a792d6ef6 more save points 2017-12-29 00:07:36 -06:00
Leo
e1092dd6de Merge pull request #33840 from XDTM/TraumaStats 
Logs traumas in the feedback database
 2017-12-26 09:36:36 -06:00
LetterJay
ac5503d338 Merge branch 'master' into upstream-merge-33055 2017-12-25 04:10:34 -06:00
Jordan Brown
164db7ae9b Prefixed all disability defines with DISABILITY_ to fix a name collision 2017-12-24 15:03:30 -06:00
XDTM
3af0aa2489 [Ready Again]Refactors disabilities into lists, allowing for independent disability sources 2017-12-18 15:19:53 -06:00
Emmett Gaines
f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
vuonojenmustaturska
7f90427a40 Replaces a bunch of loc assignments with forcemoves and moves to nullspace 2017-12-13 13:56:57 -06:00
CitadelStationBot
cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014) 
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
 2017-12-11 16:36:38 -08:00
deathride58
de4014964f Update brain_item.dm 2017-12-06 13:21:45 -05:00
XDTM
988dbe87da Brain Traumas 2017-12-06 12:05:20 -06:00
AnturK
2e0aaf8598 Ling datum antag standarization. 2017-11-05 19:32:59 -06:00
Jordan Brown
f205911b5a Adds defines for organ slots 2017-10-15 19:34:42 -05:00
Jordan Brown
075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
LetterJay
1c199d426b Merge branch 'master' into upstream-merge-31034 2017-10-03 20:15:07 -04:00