shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,944 Commits 5 Branches 0 Tags
4e2b05a22a09ebeb8c8349b8ed04ebff7e13b9cd
Commit Graph

47 Commits

Author SHA1 Message Date
Ghommie
de77b7139c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-23 00:13:14 +02:00
kevinz000
f2e905cb83 Update lobotomy.dm 2020-06-13 16:06:18 -07:00
kevinz000
9229c1dc0d Update lobotomy.dm 2020-06-13 13:12:54 -07:00
Ghommie
1bca74465f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-30 03:29:02 +02:00
Ghom
ab5d65a454 Porting the BEPIS research machinery. (#12277) 
* Initial B.E.P.I.S port.

* All nodes but sticky tape are in. Sweet.

* Mapping the BEPIS :DDD

* ah

* deers.
 2020-05-24 13:05:15 -07:00
Ghommie
a84e7bcecc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-24 04:00:51 +02:00
Ghom
12ac08d7c5 Porting tesla/electrocute code updates. (#12280) 
* Porting tesla/electrocute code updates.

* Why is the dominator being insta-deleted by zaps a good idea?

* Yikes.

* ah
 2020-05-17 16:35:17 -07:00
Ghommie
30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00
Putnam3145
3531459d8b Some trauma rebalancing (#12144) 
* Some trauma rebalancing.

* Wow I didn't actually commit the 50% change

* when did i stop compiling before pushing
 2020-05-09 01:42:39 +02:00
kevinz000
9cb4c3c062 replace can_start 2020-02-11 23:25:18 -07:00
Ghommie
e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
Thalpy
bd07ff4bf7 This should be the one! 2019-11-21 18:55:43 +00:00
Ghommie
a650e1e411 Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness" 2019-11-05 05:37:28 +01:00
Linzolle
88814415dc tend wounds 2019-10-17 16:59:33 -05:00
Linzolle
b50804dfc3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dissection 2019-10-11 20:06:26 -05:00
kevinz000
b0b274762c Merge pull request #9441 from lolman360/whydowehave1000branches 
Ports /tg/ advanced surgerytools and tool defines.
 2019-10-11 12:10:31 -07:00
lolman360
04521551f0 one commit wonder 2019-10-08 19:46:28 +11:00
Linzolle
a2007dc20f oops 2019-09-22 20:30:16 -05:00
XDTM
947bb8cc69 port muscled veins too why not 2019-09-22 19:59:17 -05:00
terranaut1
129e3a9fc9 make dissection available early 2019-09-22 17:47:20 -05:00
Linzolle
4878472aa4 fixes 2019-09-22 17:39:37 -05:00
AnturK
12a691d950 Surgery cleanup (#40788) 
* Surgery cleanup

* Proper mobtype
 2019-09-22 12:05:26 -05:00
Fermi
97fa05f446 Merge branch 'master' into tg-Organ-port 2019-09-21 14:01:52 +01:00
Linzolle
573932437e COMMA 2019-09-18 23:55:52 -05:00
Linzolle
cd2e894ebe display results and wording 2019-09-18 23:51:35 -05:00
Linzolle
4bf9c8cc84 citadel fixes 2019-09-18 23:15:05 -05:00
XDTM
023428f6a4 port experimental dissection 2019-09-18 23:04:11 -05:00
XDTM
8ad11d7250 ports ligament surgeries 2019-09-18 22:55:46 -05:00
Fermi
c23d6f0113 I missed an earlier port. 2019-09-17 01:08:37 +01:00
TrilbySpaceClone
084b37ae4e tada 2019-09-04 10:13:32 -04:00
Sishen
23d4b9827d fix, yadda yadda 2019-08-11 01:19:37 -04:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Ragolution
e00c196824 CALL IT A MEME PR ONE MORE TIME AND SEE WHAT HAPPENS 
bottom text
 2019-03-21 19:07:22 -04:00
Ragolution
7b26e7038a Merge branch 'master' into BadWording 2019-03-18 16:30:01 -04:00
Ragolution
9cb4265675 Improves operation console stuff 
Changes confusing wording on Optable console
 2019-03-18 16:22:18 -04:00
Ragolution
67f25f2721 Additional methods. 
Requested by nicc
 2019-03-14 18:02:29 -04:00
Ragolution
12db99dc01 Update revival.dm 
Adds Abductor Science Tool to acceptable implements to revive a dead body.
 2019-03-14 13:21:04 -04:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
kevinz000
b99556c70f Nanites port from /tg/station, original coder XDTM 2018-08-23 01:16:32 -07:00
ShizCalev
4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
Dax Dupont
48c37df7cd [s] Fixes bioware surgery exploit (#37860) 
* Fixes bioware surgery

* my ass must blast
 2018-05-16 14:34:36 -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
f00246ae79 [MIRROR] The names of Surgery Disks now match their type of surgery (#5950) 
* The names of Surgery Disks now match their type of surgery

* Merge pull request #36407 from SailorDave/surgery-disk-names

The names of Surgery Disks now match their type of surgery
 2018-03-14 16:58:36 -05:00
CitadelStationBot
a2e6253f00 [MIRROR] Disease antagonist (#5815) 
* Disease antagonist

* Update mobs.dm

* can I go to sleep yet
 2018-03-05 15:20:59 -06:00
CitadelStationBot
2c5b8a586b [MIRROR] Operating computers now display required surgery chems (#5701) 
* Operating computers now display required surgery chems

* Rebuilds tgui
 2018-02-27 05:05:02 -06:00
CitadelStationBot
26702fda91 [MIRROR] Makes new surgeries check for tool qualities (#5690) 
* Makes new surgeries check for tool qualities  (#35847)

* Makes new surgeries check for tool qualities

* Gives augments and autosurgeon some tool_act love

* okay

* Fix duplicate definition

* Makes new surgeries check for tool qualities
 2018-02-24 07:02:26 -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