Rykka
c0644f12ea
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 and https://github.com/VOREStation/VOREStation/pull/6585 and https://github.com/Yawn-Wider/YWPolarisVore/pull/584
2020-02-17 03:01:24 -07:00
Erik
11268a3ff4
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into MyUpstreamMerge
2020-02-13 20:36:32 -08:00
Shadow
7f4c580d19
Minor Changes
2020-02-09 22:30:18 -06:00
izac112
933385020f
Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update
...
# Conflicts:
# code/modules/mining/machine_stacking.dm
# Resolved
# code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm # Resolved mostly besides line 717 "plasteel: undefined var"
# even though the only change in this line is removing the comment
# icons/mob/widerobot_vr.dmi
# Resolved
# maps/tether/tether-07-station3.dmm
# Resolved
2020-01-31 18:23:50 +01:00
Rykka
fab4ecff1d
Found the issue thanks to Heroman
2020-01-27 01:31:42 -07:00
Cebutris
9bde77ed63
ringtone >> ttone
2020-01-23 18:44:00 -05:00
Cebutris
70fa53cb2c
beep
2020-01-22 02:59:41 -05: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
Heroman
181331d166
Earlyports fix for barista missing access
2020-01-15 04:48:41 +10:00
Razgriz
89257f4f73
Remove Resleeving Sickness
2020-01-13 19:08:14 -07:00
Hawk-v3
4623c3c1d1
Merge branch 'master' into master
2020-01-13 20:31:39 +00:00
Hawk_v3
f641220882
Compilation fixing, and Phorochem depreciation fix.
...
We should now be good to go! Praise Travis!
2020-01-13 20:07:30 +00:00
Hawk_v3
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
Hawk_v3
ba05f70db6
Merge remote-tracking branch 'upstream/master'
2020-01-13 18:37:42 +00:00
Novacat
7344a6f953
WE ALWAYS DELIVER!!
2020-01-12 22:02:04 -05:00
Hawk_v3
20596d9787
Merge remote-tracking branch 'upstream/master'
2020-01-13 00:01:47 +00:00
Holdelta
d06a76d04d
Update engineering.dm
2020-01-11 23:52:42 -08:00
Holdelta
0156335b49
Update engineering.dm
2020-01-11 23:18:51 -08: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
Hawk_v3
8a0b78c322
Merge remote-tracking branch 'upstream/master'
2020-01-01 15:16:53 +00:00
Novacat
3ef9dd9b28
Merge pull request #6362 from Ketrai/superqualityforbartenders
...
makes glasses mass producable
2019-12-31 10:22:24 -05:00
Hawk_v3
a48b6f7cb2
Merge remote-tracking branch 'upstream/master'
2019-12-29 19:01:58 +00: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
Hawk_v3
6b935d64ec
Merge remote-tracking branch 'upstream/master'
2019-12-21 21:57:49 +00:00
Meghan-Rossi
f59e2811e3
Merge branch 'upstream-merge-6520' into prybars
2019-12-19 18:47:49 +00:00
RadiantFlash7
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
RadiantFlash7
10a5bd5e1a
instrument crate
...
Instrument crate
2019-12-17 00:31:29 -05: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
Hawk_v3
5b13642c12
Merge remote-tracking branch 'upstream/master'
2019-12-08 18:15:35 +00: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
Hawk_v3
a5c7909ed7
Merge remote-tracking branch 'upstream/master'
2019-11-17 12:42:55 +00: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
Hawk_v3
f976948ce3
Merge remote-tracking branch 'upstream/master'
2019-11-07 19:54:10 +00:00
Atermonera
a45472b446
Update Chat System to use to_chat(src, "") instead of src << ""
2019-11-05 19:22:38 -05:00
