fab4ecff1d
Found the issue thanks to Heroman
2020-01-27 01:31:42 -07:00
89257f4f73
Remove Resleeving Sickness
2020-01-13 19:08:14 -07:00
4623c3c1d1
Merge branch 'master' into master
2020-01-13 20:31:39 +00:00
f641220882
Compilation fixing, and Phorochem depreciation fix.
...
We should now be good to go! Praise Travis!
2020-01-13 20:07:30 +00:00
6dcf1520b4
Let's get this wrapped up and ready to go.
...
Removed all KHI references, and the Vore AI Law stuff.
2020-01-13 19:38:10 +00:00
ba05f70db6
Merge remote-tracking branch 'upstream/master'
2020-01-13 18:37:42 +00:00
7344a6f953
WE ALWAYS DELIVER!!
2020-01-12 22:02:04 -05:00
20596d9787
Merge remote-tracking branch 'upstream/master'
2020-01-13 00:01:47 +00:00
d06a76d04d
Update engineering.dm
2020-01-11 23:52:42 -08:00
0156335b49
Update engineering.dm
2020-01-11 23:18:51 -08:00
747114793c
WE ALWAYS DELIVER!
2020-01-11 05:28:00 +03:00
4f6a7972d6
Merge pull request #6404 from Ketrai/iwantdie
...
adds food cubes.
2020-01-09 22:51:32 -05:00
658c0560c8
Merge pull request #6380 from Heroman3003/vore_laws
...
Adds some vorish silicon lawsets
2020-01-09 22:50:58 -05:00
5f05d26eb9
Merge branch 'master' into resleeving_sickness
2020-01-10 09:43:42 +10:00
f67866957f
Merge pull request #6602 from Heroman3003/legcuffening
...
Makes legcuffs printable in hacked autolathe
2020-01-08 13:48:55 -05:00
b714419bf3
makes the cargo order plop out a filled machine.
2020-01-08 10:25:44 +01:00
9112a9a2b6
Food cubes
...
woop
removes a line of unneeded code
2020-01-07 22:51:12 +01:00
2b10027024
Makes the sickness affect only people dying via non-vore deaths, adds fluff version with no downsides
2020-01-07 17:02:39 +10:00
387fa7e898
Adjusts Eradicator law 3 wording
2020-01-03 12:44:56 +10:00
1d6a57bbfd
Typos and slight rewordings
2020-01-03 07:46:01 +10:00
8a0b78c322
Merge remote-tracking branch 'upstream/master'
2020-01-01 15:16:53 +00:00
3ef9dd9b28
Merge pull request #6362 from Ketrai/superqualityforbartenders
...
makes glasses mass producable
2019-12-31 10:22:24 -05:00
a48b6f7cb2
Merge remote-tracking branch 'upstream/master'
2019-12-29 19:01:58 +00:00
d359362536
Adds some vorish lawsets
2019-12-29 12:15:29 +10:00
45b4947d1e
Merge pull request #6584 from TheFurryFeline/TFF-Print_Da_Sprayers
...
Printable Spray Bottles
2019-12-25 18:10:16 -05:00
e6021d108d
makes glasses mass producable
2019-12-22 21:15:29 +01:00
6b935d64ec
Merge remote-tracking branch 'upstream/master'
2019-12-21 21:57:49 +00:00
f59e2811e3
Merge branch 'upstream-merge-6520' into prybars
2019-12-19 18:47:49 +00:00
ac315b90cf
Fixed Missing z level declaration effect
...
Whoo, Sleep deprivation.
Now works properly, and adds missing coma causing failed compile.
2019-12-17 00:54:36 -05:00
10a5bd5e1a
instrument crate
...
Instrument crate
2019-12-17 00:31:29 -05:00
ef75d1c2a0
Clean up dead code obsoleted by outfit system
2019-12-16 00:51:16 -05:00
c6bed66e10
Two new undershirts ( #6556 )
...
* Add files via upload
* Add files via upload
2019-12-14 04:04:15 -05:00
5b13642c12
Merge remote-tracking branch 'upstream/master'
2019-12-08 18:15:35 +00:00
acf72f115a
Update security.dm
2019-11-24 17:27:22 -05:00
99bc3dcdbc
Security / PseudoCargo Expansion
2019-11-24 17:23:48 -05:00
a5c7909ed7
Merge remote-tracking branch 'upstream/master'
2019-11-17 12:42:55 +00:00
9d7c9714f3
Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin
2019-11-15 12:12:55 -05:00
581e7c7764
Reduce volume, reduce loop time
2019-11-13 05:31:33 -07:00
f976948ce3
Merge remote-tracking branch 'upstream/master'
2019-11-07 19:54:10 +00:00
a45472b446
Update Chat System to use to_chat(src, "") instead of src << ""
2019-11-05 19:22:38 -05:00
17f59d539a
Fix some people spawing without prybars
...
Fixes centcom officers, clowns, and mimes spawning without emergency supply boxes by making them use the outfit system. Adds prybars to promethean emergency lunchboxes.
Fixes #6154
2019-11-04 01:36:45 +00:00
ae859c49e9
[READY] Recolourable energy weapons. ( #6507 )
2019-11-01 12:38:06 -04:00
c177796c2d
Add Sounds to stuff! (Port from VOREStation)
2019-10-29 17:32:08 -04:00
a3fb3e3950
Merge branch 'master' of https://github.com/VOREStation/VOREStation into making-of-shadekin
2019-10-29 09:33:48 +10:00
3c8cd11eac
Reupdated Station 1 map
2019-10-24 21:57:58 +01:00
54aeb32617
Merge pull request #6091 from Novacat/nova-ert
...
Uplink additions
2019-10-21 21:01:06 -04:00
7dd592aa05
Uplink additions
...
Adds a few tools and medicines to uplinks. Also includes some polaris-side radio tweaks since I forgot I had it on this branch.
2019-10-21 18:57:44 -04:00
169d8acedd
Medical Expansion
2019-10-19 23:28:38 -04:00
3e31046aef
Fixes file discrepancy for autolathe ammo recipies
2019-10-14 05:35:30 +10:00
2cc8800ede
Merge remote-tracking branch 'upstream/master'
2019-10-08 15:14:36 +01:00
Rykka