Poojawa
3113074bfb
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-08 02:55:32 -05:00
kevinz000
dcb37bfd0e
Merge pull request #9418 from Ghommie/Ghommie-cit216
...
Porting a load of viro, (sentient) disease, symptoms code updates from tg.
2019-10-07 23:36:11 -07:00
Ghommie
3d22f4ec60
Porting a load of disease/symptoms code updates.
2019-10-05 07:14:25 +02:00
Fermi
79e85e2cfa
Fixes some runtimes
2019-10-04 03:53:02 +01:00
Fermi
89f3a01bc0
Merge branch 'master' into tg-Organ-port
2019-10-01 06:17:58 +01:00
Poojawa
117e5a409d
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-01 00:05:44 -05:00
kevinz000
0febc1977a
Merge pull request #9191 from Linzolle/fireman
...
Ports fireman carrying from /tg/
2019-09-28 00:38:08 -07:00
Poojawa
f57bdc39a2
I still fucking hate components.
2019-09-23 02:03:37 -05: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
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
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
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
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
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
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
Poojawa
b671384015
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-08-15 08:23:48 -05:00
kevinz000
2cdfa9cf2f
Merge pull request #9126 from Sishen1542/viro-cures
...
Adds more variety in virus cures, more consistent difficulty scaling.
2019-08-15 01:12:12 -07:00
deathride58
9010b9003a
Merge pull request #8930 from Citadel-Station-13/kevinz000-patch-54
...
Fixes nanite viruses take two
2019-08-14 15:01:33 -04:00
Sishen
382487fdc2
viruseseses-cures
2019-08-13 05:32:37 -04:00
kevinz000
69884d1abe
Merge pull request #9062 from Trilbyspaceclone/patch-207
...
Makes smile not as horrable.
2019-08-11 10:08:45 -07:00
Poojawa
dcd682bd59
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-10 23:48:47 -05:00
Poojawa
2b2bdb37ba
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-08-10 23:26:20 -05:00
