Heroman3003
b12348f909
Merge branch 'master' into maint_pred
2020-02-24 11:00:59 +10:00
Rykka
5e2f2db1ed
Final fix. I swear.
2020-02-17 14:02:10 -07:00
Rykka
39567d75e2
EARLYPORT: Fix Air Pump loop sound stacking multiple times per pump.
...
Turns out that the # was so, so, so far off. It was acting as if it was 0.4 seconds per loop, for an 11 SECOND SOUND FILE.
My bad.
Earlyport of https://github.com/PolarisSS13/Polaris/pull/6700
2020-02-17 02:59:13 -07:00
Novacat
4f4a29b5fc
Merge pull request #6568 from VOREStation/stream
...
Remove use of <<
2020-02-14 09:34:12 -05:00
Heroman3003
718feb1ebe
Adds pineapple pizzabox ( #6682 )
2020-02-13 17:11:43 -05:00
Arokha Sieyes
47ccc655db
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
Heroman
8ac52fef61
Adds Maintenance Predator random event
2020-02-12 12:33:46 +10:00
Novacat
12a412be47
Merge pull request #6519 from Heroman3003/beltminecrate
...
QoL to supplypacks related to Belt Mining
2020-02-10 11:06:20 -05:00
Spades
ddc544205d
Merge pull request #6429 from Heroman3003/morphevent
...
Adds Morph Spawn event
2020-02-10 07:21:57 -05:00
Heroman
8e26511aa1
Prevents some teleporting abuses with taur riding
2020-02-08 07:45:53 +10:00
Heroman
32a30fa527
Moves jetpack into its own expensive crate
2020-02-01 09:21:30 +10:00
Heroman
2144e95ca7
Increases amount of supplies in belt mining crate
2020-01-31 15:32:50 +10:00
Heroman
a733980a6e
Merge branch 'master' of https://github.com/VOREStation/VOREStation into morphevent
2020-01-28 12:43:47 +10:00
Unknown
c6a709b5e4
Merge remote-tracking branch 'VOREStation/master' into upstream-merge-6632
2020-01-21 01:28:43 -05:00
Atermonera
5bcb9cc934
Fix various syntactic problems
2020-01-21 01:06:04 -05:00
Atermonera
f7da338790
Move Microwave recipes to their own subtype of the recipe datum.
2020-01-21 00:35:38 -05:00
Heroman3003
4af118cb0d
Merge branch 'master' into morphevent
2020-01-16 09:00:43 +10:00
Heroman
181331d166
Earlyports fix for barista missing access
2020-01-15 04:48:41 +10:00
Novacat
7344a6f953
WE ALWAYS DELIVER!!
2020-01-12 22:02:04 -05:00
Heroman
43760db7dd
Adds Morph Spawn event
2020-01-11 20:15:10 +10:00
drexample
747114793c
WE ALWAYS DELIVER!
2020-01-11 05:28:00 +03:00
Novacat
4f6a7972d6
Merge pull request #6404 from Ketrai/iwantdie
...
adds food cubes.
2020-01-09 22:51:32 -05:00
Novacat
658c0560c8
Merge pull request #6380 from Heroman3003/vore_laws
...
Adds some vorish silicon lawsets
2020-01-09 22:50:58 -05:00
Heroman3003
5f05d26eb9
Merge branch 'master' into resleeving_sickness
2020-01-10 09:43:42 +10:00
Atermonera
f67866957f
Merge pull request #6602 from Heroman3003/legcuffening
...
Makes legcuffs printable in hacked autolathe
2020-01-08 13:48:55 -05:00
ketraiski
b714419bf3
makes the cargo order plop out a filled machine.
2020-01-08 10:25:44 +01:00
Ketrai
9112a9a2b6
Food cubes
...
woop
removes a line of unneeded code
2020-01-07 22:51:12 +01:00
Heroman
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
Heroman
387fa7e898
Adjusts Eradicator law 3 wording
2020-01-03 12:44:56 +10:00
Heroman
1d6a57bbfd
Typos and slight rewordings
2020-01-03 07:46:01 +10:00
Novacat
3ef9dd9b28
Merge pull request #6362 from Ketrai/superqualityforbartenders
...
makes glasses mass producable
2019-12-31 10:22:24 -05:00
Heroman
d359362536
Adds some vorish lawsets
2019-12-29 12:15:29 +10:00
Atermonera
45b4947d1e
Merge pull request #6584 from TheFurryFeline/TFF-Print_Da_Sprayers
...
Printable Spray Bottles
2019-12-25 18:10:16 -05:00
Ketrai
e6021d108d
makes glasses mass producable
2019-12-22 21:15:29 +01:00
Meghan-Rossi
f59e2811e3
Merge branch 'upstream-merge-6520' into prybars
2019-12-19 18:47:49 +00:00
Atermonera
ef75d1c2a0
Clean up dead code obsoleted by outfit system
2019-12-16 00:51:16 -05:00
saysage
c6bed66e10
Two new undershirts ( #6556 )
...
* Add files via upload
* Add files via upload
2019-12-14 04:04:15 -05:00
Novacat
acf72f115a
Update security.dm
2019-11-24 17:27:22 -05:00
Mechoid
99bc3dcdbc
Security / PseudoCargo Expansion
2019-11-24 17:23:48 -05:00
Unknown
9d7c9714f3
Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin
2019-11-15 12:12:55 -05:00
Rykka
581e7c7764
Reduce volume, reduce loop time
2019-11-13 05:31:33 -07:00
Atermonera
a45472b446
Update Chat System to use to_chat(src, "") instead of src << ""
2019-11-05 19:22:38 -05:00
Meghan-Rossi
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
lolman360
ae859c49e9
[READY] Recolourable energy weapons. ( #6507 )
2019-11-01 12:38:06 -04:00
Rykka Stormheart
c177796c2d
Add Sounds to stuff! (Port from VOREStation)
2019-10-29 17:32:08 -04:00
Heroman3003
a3fb3e3950
Merge branch 'master' of https://github.com/VOREStation/VOREStation into making-of-shadekin
2019-10-29 09:33:48 +10:00
Novacat
54aeb32617
Merge pull request #6091 from Novacat/nova-ert
...
Uplink additions
2019-10-21 21:01:06 -04:00
Unknown
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
Mechoid
169d8acedd
Medical Expansion
2019-10-19 23:28:38 -04:00
Heroman
3e31046aef
Fixes file discrepancy for autolathe ammo recipies
2019-10-14 05:35:30 +10:00
