kevinz000
f686ea75d3
Merge pull request #8615 from Ghommie/Ghommie-cit45
...
Virtual reality componentization.
2019-10-10 02:09:51 -07:00
kevinz000
0c9a065096
Merge pull request #8401 from Ghommie/Ghommie-cit11
...
Refactoring Implants' loc n°3
2019-10-10 02:09:37 -07: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
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
cac4157894
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
2019-10-05 22:03:37 +02:00
Ghommie
32a73b24c0
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11
2019-10-05 18:22:43 +02: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
kevinz000
0febc1977a
Merge pull request #9191 from Linzolle/fireman
...
Ports fireman carrying from /tg/
2019-09-28 00:38:08 -07: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
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
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
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
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
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
Sishen
26de2b8111
greybois
2019-08-16 10:49:26 -04: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
2b2bdb37ba
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-08-10 23:26:20 -05:00
Poojawa
d496e16dde
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-08-10 19:14:41 -05:00
Fermi
1fb07e286a
Removing reviewer comments incase of fullmerge.
2019-08-08 19:53:07 +01:00
Thalpy
2256bbb63c
Merge branch 'master' into master
2019-08-07 09:30:53 +01:00
kevinz000
2959a87892
Merge pull request #9022 from Ghommie/Ghommie-cit175
...
Ports "More robust dorfs."
2019-08-07 00:51:19 -07:00
kevinz000
a845b5ae0c
Merge pull request #8986 from Ghommie/Ghommie-cit163
...
reworked ninja stealth, made ninja shoes completely silent, cleaned up scarily old code.
2019-08-07 00:49:23 -07:00
kevinz000
6db8d9aef4
Merge pull request #9017 from Trilbyspaceclone/patch-205
...
Ports "Some stealth box changes #45332 " Aka nerfing Stealth boxes
2019-08-07 00:48:12 -07:00
Thalpy
53e9c140cf
Merge pull request #22 from Citadel-Station-13/master
...
YARR
2019-08-06 16:08:16 +01:00
