Commit Graph

336 Commits

Author SHA1 Message Date
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
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
dcd682bd59 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-10 23:48:47 -05:00
Poojawa
283b5d050e Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-08 16:51:53 -05:00
Thalpy
2256bbb63c Merge branch 'master' into master 2019-08-07 09:30:53 +01:00
Poojawa
3499d73f6b Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods 2019-07-31 19:24:39 -05:00
Ghommie
78e4c8689b reworked ninja stealth, made ninja shoes completely silent, cleaned up scarily old code. 2019-07-28 01:04:19 +02:00
Thalpy
15ab1a26a4 Merge branch 'master' into master 2019-07-21 01:50:41 +01:00
kevinz000
08fd6af7fc Merge pull request #8830 from Ghommie/Ghommie-cit114
Ports the toggleable dark mode to the game!
2019-07-20 11:57:13 -07:00
deathride58
7e12cfc9ff Merge pull request #8868 from Citadel-Station-13/kevinz000-patch-57
Nanites in non /livings are no longer immune to EMPs
2019-07-17 17:51:15 -04:00
deathride58
d7cbbfc8a4 Merge pull request #8866 from Citadel-Station-13/kevinz000-patch-54
Fixes nanites getting instant nuked by EMPs and shocks and removes the random drain in favor of a scaled drain
2019-07-17 17:48:38 -04:00
Thalpy
9c7b1dee97 Merge branch 'master' into master 2019-07-15 21:23:04 +01:00
kevinz000
102bede4be Merge pull request #7544 from deathride58/nanitepoolnerf
Nerfs nanite pools
2019-07-14 14:15:53 -07:00
Thalpy
4c4dbd0e17 Merge branch 'master' into master 2019-07-13 19:33:46 +01:00
Ghommie
129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
kevinz000
c30a3aafb6 Update nanites.dm 2019-07-10 22:49:31 -07:00
kevinz000
db05432778 Update nanites.dm 2019-07-10 22:44:21 -07:00
kevinz000
2995b22907 Update nanites.dm 2019-07-10 22:38:43 -07:00
Thalpy
c418312cc6 Merge branch 'master' into master 2019-07-09 05:33:09 +01:00
Ghommie
2af4cfa0ce component fixes. 2019-07-08 15:09:18 +02:00
Ghommie
9043402483 Rubber toolboxes. 2019-07-08 14:34:14 +02:00
kevinz000
1b4df74efb Merge pull request #8802 from Ghommie/Ghommie-cit101
Ports in RPGs for nuke ops, failsafe uplink codes, some carp plushie exploit fix etc.
2019-07-07 02:39:07 -07:00
Ghommie
03315d1cbb Ports a toggleable darkmode to the game! 2019-07-05 22:29:50 +02:00
Thalpy
8a6e669060 Merge branch 'master' into master 2019-07-04 03:14:29 +01:00
Ghommie
f39a5d2f6a Ports in RPGs for nuke ops, failsafe uplinks and some carp plushie exploit fix. 2019-06-30 21:53:33 +02:00
Ghommie
dc20b605fb Fixing some emergency pod storage refactor fuck ups. 2019-06-30 00:40:39 +02:00
Fermi
10109d0fe5 Merge branch 'pr/18' 2019-06-23 19:15:07 +01:00
Ghommie
b782226900 ports "Componentizes orbiting" 2019-06-17 00:19:57 +02:00
Fermi
be36a8bb33 Cleanup 2019-06-15 18:04:06 +01:00
Fermi
7a66039f0c Fixing merge errors.
Testmerge ready.
2019-06-14 21:55:17 +01:00
Fermi
6b9becce71 Merge branch 'pr/14' 2019-06-14 21:29:04 +01:00
Fermi
eab52a51e6 Fixed compile errors. 2019-06-13 03:05:34 +01:00
Fermi
463b4e19ec (var/mob/living/master = parent) fix 2019-06-13 01:01:19 +01:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Poojawa
1f1f951924 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-06-03 05:35:52 -05:00
Ghommie
d6e54bf237 Fixes and updates pod's emergency suits storage. 2019-06-02 18:28:30 +02:00
Fermi
91f10442cf Merge branch 'pr/12' 2019-05-26 02:05:48 +01:00
Poojawa
971ddef989 reverts forensics components. If I can't figure it out, MURDER IT 2019-05-22 04:10:29 -05:00
nero1024
732bb6575b tweak footstep frequency 2019-05-21 14:49:15 -05:00
Fermi
bb4aecbd5f Progressional fixes 2019-05-20 07:44:39 +01:00
Nero1024
cbdb98988c fix footsteps for naga/tentacle 2019-05-17 20:42:54 -05:00
Nero1024
752f368ed2 Ports additional footsteps
And actually make it all compile.
2019-05-17 19:12:22 -05:00
Nero1024
2a4a656a4d Port new footsteps from tg 2019-05-17 18:10:03 -05:00
Poojawa
0f6677b956 Blood colors happens to footprints now.
Different prints not working. splatter effect not working, I'm just sick of looking at this right now.
2019-05-16 08:23:53 -05:00
Fermi
246a344fed Mreac fixed, tongue health, pH vars+ (drink, food, pryo, tox remain) 2019-05-16 00:58:30 +01:00
Poojawa
657e6316c6 port tg 42691 for component transfer enforcement 2019-05-14 02:49:38 -05:00
Poojawa
1a047c0068 I think I got it.
Also gibs should be better too.
2019-05-12 04:06:35 -05:00
Fermi
ec2f33ceb5 Added Hatmium and a few slight fixes. 2019-05-12 03:42:23 +01:00