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
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
0f4f20c29a
Update buffs.dm
2019-08-23 03:50:28 -04:00
bd1dae9082
Update buffs.dm
2019-08-23 03:46:13 -04:00
580ea38199
Update buffs.dm
2019-08-23 03:45:44 -04:00
23333f6ea5
reverts the majority of clean act because it doesn't work properly otherwise
2019-08-20 23:03:31 -05:00
96834bc517
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-20 03:36:17 -05:00
86cb735cc9
Merge branch 'master' into kevinz000-patch-64
2019-08-18 23:41:40 -07:00
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
2922f08ef6
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-08-17 23:41:28 -05:00
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
725a8046e1
just need items to actually have their overlays, ree
2019-08-17 04:50:24 -05:00
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
26de2b8111
greybois
2019-08-16 10:49:26 -04:00
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
0290a46ddc
Impliments Ghom review, reverts blood list back to component
2019-08-15 12:32:44 -05:00
2073921f4b
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-15 08:39:41 -05:00
b671384015
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-08-15 08:23:48 -05:00
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
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
382487fdc2
viruseseses-cures
2019-08-13 05:32:37 -04:00
69884d1abe
Merge pull request #9062 from Trilbyspaceclone/patch-207
...
Makes smile not as horrable.
2019-08-11 10:08:45 -07:00
dcd682bd59
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-10 23:48:47 -05:00
2b2bdb37ba
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-08-10 23:26:20 -05:00
d496e16dde
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-08-10 19:14:41 -05:00
efe72ce973
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
2019-08-09 06:47:27 +02:00
283b5d050e
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-08 16:51:53 -05:00
1fb07e286a
Removing reviewer comments incase of fullmerge.
2019-08-08 19:53:07 +01:00
23e3263fcb
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54
2019-08-08 04:46:54 +02:00
b5841c718b
Genpop for security
2019-08-07 06:14:35 -05:00
2256bbb63c
Merge branch 'master' into master
2019-08-07 09:30:53 +01:00
2959a87892
Merge pull request #9022 from Ghommie/Ghommie-cit175
...
Ports "More robust dorfs."
2019-08-07 00:51:19 -07:00
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
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
53e9c140cf
Merge pull request #22 from Citadel-Station-13/master
...
YARR
2019-08-06 16:08:16 +01:00
7a22e73a79
Update speech.dm
2019-08-06 08:47:10 -04:00
8978f0ecf9
Defaults the teleportation forceMove arg to TRUE.
2019-08-05 18:19:48 +02:00
5795f6bbe2
Merge branch 'master' into master
2019-08-05 09:09:36 +01:00
aea2f6f523
Merge pull request #8900 from Seris02/spaceruinsyee
...
Abductor Replication Lab space ruin - take 2
2019-08-05 00:55:40 -07:00
f1c9a07f6d
Merge pull request #8912 from Ghommie/Ghommie-cit146
...
Ports "Headset Channel Descriptions Are No Longer Hardcoded"
2019-08-04 22:41:49 -07:00
53a9f3ac51
Merge pull request #9036 from Linzolle/invisiclothes
...
fixes combat gloves plus having no icon, allows for shoes to have their item_state set to use a differently named icon on mobs
2019-08-04 19:09:36 -07:00
27b3cb6656
Merge pull request #9018 from Ghommie/Ghommie-cit171
...
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
2019-08-04 19:04:59 -07:00
d0d6bc37a6
Merge branch 'master' into job-menu-improvements
2019-08-02 11:55:28 -05:00
a82f9c011b
Merge pull request #9004 from Trilbyspaceclone/Crafting
...
Ports "Adds helpers for finding martial arts types #42045 " as well as "Adds simple framework for learnable crafting recipes #43296 "
2019-08-02 00:57:05 -07:00
bc9bca8d04
oh my god
2019-08-02 01:20:32 -05:00
3499d73f6b
Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods
2019-07-31 19:24:39 -05:00
218cbe2dbc
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-07-31 19:09:35 -05:00
ec560c8371
Ports "More robust dorfs."
2019-07-31 22:14:39 +02:00
937c809b0b
Update action.dm
2019-07-31 12:57:10 -04:00
ec2a3ea778
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
2019-07-31 18:56:00 +02:00
Ghommie