shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,050 Commits 5 Branches 0 Tags
ff069ecde2c5ce4f7ed2ec331da2969bb86c545d
Commit Graph

165 Commits

Author SHA1 Message Date
Lin
f7b91f9b65 Merge pull request #10238 from Ghommie/Ghommie-cit478 
Brings in some mapping code updates.
 2020-01-03 00:01:54 +00:00
Ghommie
edd05cebea Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367 2019-12-30 00:28:36 +01:00
Ghommie
e1949b0131 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367 2019-12-23 19:02:20 +01:00
Ghommie
8566e2396d Brings in some mapping code updates. 2019-12-19 00:44:14 +01:00
Ghommie
80402a0d88 Ports some hud and update_icon code updates. 2019-12-16 23:29:20 +01:00
Ghommie
a9335aa946 Fixes a long lasting runtime with filter data sorting. 2019-12-08 13:21:29 +01:00
Ghommie
af0110db40 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367 2019-11-27 21:16:20 +01:00
Ghommie
4e05c27cdb Updating supply pods code. 2019-11-27 01:54:10 +01:00
BlackMajor
786d40032d Merge pull request #9922 from GrayRachnid/braintraumasport 
Ports new Brain Traumas from /tg/. Does not include the shitty creeper antag or Wizard Traumas, i'm porting wizard traumas later. Also adds the Desynchronizer and changes the way some heaRing args are handled.
 2019-11-25 12:31:15 +13:00
GrayRachnid
c8e52fb8e1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs 2019-11-22 15:24:15 -05:00
Ghommie
21f15e411d Part 3 2019-11-19 19:34:42 +01:00
Ghommie
a52e292cc8 Ports "examine-code refactor"... part 1... 2019-11-19 03:28:06 +01:00
Ghommie
6e9d2d57c0 check_shields from human to living, part 2 2019-11-17 22:06:19 +01:00
kevinz000
6909857e04 Merge pull request #9632 from Ghommie/Ghommie-cit281 
Porting multi-z support updates.
 2019-11-14 15:58:53 -07:00
Ghommie
4ef1d64356 PR #47500, #47501, #47557, #47588. 2019-11-12 19:00:45 +01:00
Ghommie
1e49ce76d3 Dreamchecker compatibility changes, part 1. 2019-11-10 20:48:30 +01:00
Ghommie
17e794bd59 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281 2019-10-31 01:43:44 +01:00
kevinz000
fb936a5319 Merge pull request #9598 from deathride58/runtimefixpass 
various runtime fixes - plasmaman tongues no longer have a maxHealth of "alien" and more
 2019-10-29 21:41:11 -07:00
Ghommie
4aa1d55abb Porting multi-z support updates. 2019-10-27 16:32:32 +01:00
Ghommie
a50606bb67 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit259 2019-10-24 10:10:07 +02:00
deathride58
0ae8953da9 various runtime fixes - plasman tounges no longer have a maxhealth value of "alien", simplemobs no longer runtime when shot, removing filters from something that lacks filters now works 2019-10-24 02:52:40 -04:00
deathride58
724e4305e1 Fixes examinetext of mobs not actually showing when items are bloodstained by making get_examine_name() properly take blood-stained status into account 2019-10-23 21:08:59 -04:00
Ghommie
e1928a18f1 Porting GetComponent macros removal, and some related changes. 2019-10-23 15:04:28 +02:00
Poojawa
d6e28180a1 if this doesn't work, I won't be fixing it 2019-10-22 00:34:25 -05:00
GrayRachnid
9f8ad74bf9 New traumas and some other things. 2019-10-08 03:53:01 -04:00
Poojawa
ee5155bdbb fixes oddities 2019-10-06 04:27:46 -05:00
Poojawa
b589565398 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-03 15:05:26 -05:00
Ghommie
d245a9d28d addendum 2019-10-02 00:42:19 +02:00
Ghommie
81fc0c1b32 more foolproofing. 2019-10-02 00:37:02 +02:00
Ghommie
cfcd325778 reworking the shoving people action. 2019-10-01 23:13:08 +02:00
Poojawa
53895106dc Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-13 12:58:02 -05:00
Poojawa
bdae9e051b Fixes some errant issues with overlays 2019-08-26 14:15:55 -05:00
Poojawa
d60ba0a207 Fixes missing DNA info for slimes, resolves virology issues 2019-08-24 04:14:47 -05:00
Poojawa
32c7a7c3ee Virology's broken as fuck, damnifino why 2019-08-21 03:36:40 -05:00
Poojawa
b29607c019 It's working again, I guess. wtf 2019-08-21 01:36:59 -05:00
Poojawa
23333f6ea5 reverts the majority of clean act because it doesn't work properly otherwise 2019-08-20 23:03:31 -05:00
Poojawa
bda3ac8745 blood dna is fixed, your ERP code is too 2019-08-20 07:41:50 -05:00
Poojawa
2eac1b6ca2 Everything's working again, for now. 2019-08-17 08:04:18 -05:00
Poojawa
725a8046e1 just need items to actually have their overlays, ree 2019-08-17 04:50:24 -05:00
Poojawa
088bc484e3 Forensics re-destroyed, but better this time. 
All lists are LAZYINITLIST, cleaning code is preserved, examine is preserved. We should be back in buisness, but this is just a 'holy fuck finally' commit
 2019-08-17 02:43:59 -05:00
Poojawa
264cbf8108 reverts the add_blood back to add_blood_DNA 2019-08-15 12:49:10 -05:00
Poojawa
0290a46ddc Impliments Ghom review, reverts blood list back to component 2019-08-15 12:32:44 -05:00
Poojawa
7d65ddb417 bug blood, ipc/slime hearts, blood gen protolathe 
we're all gucchi now boys
 2019-08-04 04:07:44 -05:00
Poojawa
c8d7f1909d holy FUCK I got gib overlays working. Why wasn't it before? 
No one will ever know.
 2019-08-01 00:58:24 -05:00
Poojawa
3499d73f6b Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods 2019-07-31 19:24:39 -05:00
Ghommie
1e1f8e627f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-07-15 17:33:41 +02:00
Ghommie
b41e289db3 Ports "Fixes default supplypods exploding their contents" & co. 2019-07-04 22:35:13 +02:00
Ghommie
ffecca8c11 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-07-03 03:24:28 +02:00
Ghommie
d5279c8373 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-06-17 09:51:22 +02:00
Ghommie
b782226900 ports "Componentizes orbiting" 2019-06-17 00:19:57 +02:00