shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,734 Commits 5 Branches 0 Tags
bcf77458dd5639ba27f07dd4acb0a174aa562dbb
Commit Graph

2522 Commits

Author SHA1 Message Date
Poojawa
f57bdc39a2 I still fucking hate components. 2019-09-23 02:03:37 -05:00
Ghommie
f449849bca if 2019-09-22 19:06:34 +02:00
Ghommie
fc933ab7bb setting durations. 2019-09-22 19:05:55 +02:00
Ghommie
9cc480a5eb datum source. 2019-09-22 19:02:49 +02:00
Ghommie
3d0cb39e91 Removes revenant blight's shabby tox damage in favor of negative mood effects, and necropolis curse if not cured. 2019-09-22 18:42:47 +02:00
Poojawa
5876a235c2 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-22 00:22:18 -05:00
Fermi
97fa05f446 Merge branch 'master' into tg-Organ-port 2019-09-21 14:01:52 +01:00
Fermi
4b44b31aa3 Okay, feature done 2019-09-21 08:24:46 +01:00
Fermi
2b80998f64 Adds: cybernetic_heart_u and VV viewer. 2019-09-21 04:19:34 +01:00
skoglol
c1e84774ac one-hand shit 2019-09-20 17:28:44 -05:00
Fermi
587568bf88 Merge branch 'master' into tg-Organ-port 2019-09-19 01:33:15 +01:00
Sishen
fa4f05b919 Update ert.dm 2019-09-18 20:13:12 -04:00
Fermi
dfa40a4b22 tg Code complete, now to bugtest and clear compile errors. 2019-09-18 23:57:21 +01:00
Fermi
c23d6f0113 I missed an earlier port. 2019-09-17 01:08:37 +01:00
Poojawa
fa7bf43ce7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-16 17:44:10 -05:00
Ghommie
c813555697 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-09-15 04:05:14 +02:00
Poojawa
2250f0e516 Merge remote-tracking branch 'refs/remotes/origin/job-menu-improvements' into gen-poppers 2019-09-13 13:00:45 -05:00
Poojawa
fa364bbad0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into gen-poppers 2019-09-13 13:00:29 -05:00
Poojawa
53895106dc Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-13 12:58:02 -05:00
Poojawa
8988d1e506 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-09-11 02:41:36 -05:00
Fermi
1e454ff1a7 Merge branch 'pr/25' into Blind-quirk-without-anger 2019-09-08 03:29:22 +01:00
kappa-sama
364d05e2b7 paxton going ape 2019-09-04 20:48:46 -04:00
kappa-sama
599634496e paxton told me to do this or else he'd go ape 2019-09-04 20:46:50 -04:00
kappa-sama
876232c1bc cultist boot cultist boot? 2019-09-04 20:38:51 -04:00
nik707
3ea520d443 Merge pull request #8649 from Ghommie/Ghommie-cit50 
Increases the default space ruin z-level count to 2
 2019-09-02 18:25:30 -05:00
Ghommie
2a7b802957 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-08-29 21:01:23 +02:00
nik707
9a0b6a21f9 Merge pull request #8904 from Citadel-Station-13/kevinz000-patch-64 
Amber alert ERTs no longer get pulse weapons
 2019-08-28 13:05:56 -05:00
BlackMajor
4d6b9f5da1 Merge pull request #8537 from Ghommie/Ghommie-cit28 
Fixes emags wasting charges on un-emaggable stuff.
 2019-08-28 13:54:03 +12:00
kevinz000
1e6845491d Update mood.dm 2019-08-26 19:54:34 -07:00
kevinz000
0eb1fdd9dc Update mood.dm 2019-08-25 11:19:01 -07:00
Linzolle
14ba00d477 shakes my head 2019-08-24 22:21:46 -05:00
Rob Bailey
5e94a5db80 ports #44155 from /tg/station 2019-08-24 20:21:44 -05:00
Ghommie
24fe7126c4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-08-24 19:05:51 +02:00
Ghommie
5d1cac62da Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-08-24 13:50:22 +02:00
Ghommie
f843a53fe9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-08-24 12:52:16 +02:00
chefferz
0f4f20c29a Update buffs.dm 2019-08-23 03:50:28 -04:00
chefferz
bd1dae9082 Update buffs.dm 2019-08-23 03:46:13 -04:00
chefferz
580ea38199 Update buffs.dm 2019-08-23 03:45:44 -04: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
96834bc517 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-20 03:36:17 -05:00
kevinz000
86cb735cc9 Merge branch 'master' into kevinz000-patch-64 2019-08-18 23:41:40 -07:00
kevinz000
8a96b29ef9 Merge pull request #9137 from Sishen1542/the-d-boiz 
addition of the "assistant response team" a pack of assistants sent in from CComm
 2019-08-18 23:34:49 -07:00
Poojawa
2922f08ef6 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-08-17 23:41:28 -05:00
BlackMajor
13f27c040e Merge pull request #8848 from Citadel-Station-13/trait_blacklisting 
Trait blacklisting system: Blacklists Mute and Brain Tumor from ALL heads of staff. Blacklists pacifist + paraplegic from HoS. Blacklists Paraplegic/nolegs from CE. Blacklists phanosthing/no-recognize-faces from HoP
 2019-08-18 15:33:08 +12: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
Sishen
26de2b8111 greybois 2019-08-16 10:49:26 -04:00
Poojawa
d71f37167f I'm about to go fucking APE 
None of this is actually viable, Footprints aren't taking proper color, aren't updating their color. It's just default red. screm
 2019-08-16 04:58:16 -05:00
Poojawa
0290a46ddc Impliments Ghom review, reverts blood list back to component 2019-08-15 12:32:44 -05:00
Poojawa
2073921f4b Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-15 08:39:41 -05:00