Commit Graph

2619 Commits

Author SHA1 Message Date
Razgriz
8285fba939 Merge pull request #4007 from Raeschen/lights
Adds a light painter device, adds to Autolathe.
2022-04-07 00:51:10 -07:00
Nadyr
a121954e24 Merge pull request #3992 from CHOMPStation2/upstream-merge-12592
[MIRROR] The Grand /TG Port - Part 6
2022-04-04 17:52:53 -04:00
Raeschen
2ff4088bd3 Adds a light painter device, adds to Autolathe.
Creates a Light Painter device.
Use the device to assign a color. Use again to reset to default color. Click on any light fixture to apply.

Simple.
2022-04-04 23:45:55 +02:00
Casey
3add9b1880 The Grand /TG Port - Part 1 2022-04-04 16:50:53 -04:00
Casey
de0be34c99 The Grand /TG Port - Part 6 2022-04-03 03:32:03 +00:00
Razgriz
21378d3a9c Merge pull request #3917 from CHOMPStation2/upstream-merge-12529
[MIRROR] Auto-Resleeving
2022-03-27 00:06:32 -07:00
Rykka
bb162d29c6 Autoresleeving PR Adaptations for CHOMPStation
Does the following:
1: Re-enables Automatic Notifications for Transcore. Ghosts can still delay these as per live, or cancel them entirely before they go off.
2: Autoresleever cannot print species with NO_SCAN, and cannot spawn you if you're whitelisted. Prevents exploits by loading a slot you're not whitelisted for and spawning as it. Incoming to resleever soon™️
3: Vore Deaths are reduced to only being a 5 minute wait, so as to prevent ghosts whining at medical "sleeve me now".
4: Autoresleever latejoin is enabled. This will spawn you as a VISITOR irregardless of occupation preferences.

Pretty screenshot of new autoresleeving bay, above Genetics and Viro, to the right of Circuits.
All doors out to maintenance have no access requirements.
![](https://i.imgur.com/kTXAusg.png)
2022-03-26 21:28:30 -06:00
Razgriz
bc8021de7b Merge branch 'master' into upstream-merge-12511 2022-03-24 18:50:27 -07:00
Razgriz
fbebae4d1b powder that makes you say yes 2022-03-24 18:32:17 -07:00
Casey
396b201cf7 Fixes the infina-scoped-rifle bug 2022-03-23 06:36:45 +00:00
Casey
dc618675c1 Shotguns and Bolt-Action Rifles 2022-03-21 09:54:13 +00:00
Casey
361a2f1568 Strapless satchel moved to bag selection 2022-03-20 18:33:21 +00:00
Casey
9885711cd2 Small Pilot QoL additions 2022-03-13 20:05:54 +00:00
Razgriz
bdd02fcc0d Merge pull request #3820 from CHOMPStation2/upstream-merge-12409
[MIRROR] Vore Stats
2022-03-11 15:55:22 -07:00
Rykka
7b461a66ff snowstorm, not snow. Oops. 2022-03-10 22:02:24 -07:00
Rykka
c7e4a0aff1 Updates all ambience files + adds desert night ambience 2022-03-10 21:49:04 -07:00
Casey
1eb126e529 Merge pull request #12409 from Very-Soft/vorestats
Vore Stats
2022-03-09 23:20:40 +00:00
Casey
5510dbf441 Merge pull request #12392 from Heroman3003/cookiefix
Brings REAL cookies to everywhere they belong
2022-03-07 09:06:24 +00:00
Casey
80f5298a18 Ammo Boxes 2022-03-03 21:23:43 +00:00
Razgriz
6d277be2c0 powder that makes you say yes 2022-03-01 01:10:30 -07:00
Casey
b721da62a1 A more elegant weapon from a more civlised age 2022-02-27 19:27:52 +00:00
Nadyr
fa1fea2c56 Merge pull request #3715 from CHOMPStation2/upstream-merge-12285
[MIRROR] 7914 branch fix
2022-02-19 19:58:40 -05:00
Nadyr
3fe87a33ed Merge pull request #3711 from CHOMPStation2/upstream-merge-12253
[MIRROR] Donk Co. Toys
2022-02-19 19:55:19 -05:00
Nadyr
6c385e6dd4 Merge pull request #3709 from CHOMPStation2/upstream-merge-12262
[MIRROR] primative-shields
2022-02-19 18:53:34 -05:00
Nadyr
f1c5f657bd powder that makes you say yes 2022-02-19 18:20:32 -05:00
Casey
e73d113da0 7914 branch fix 2022-02-19 21:25:16 +00:00
Casey
3d6510f3ea Donk Co. Toys 2022-02-19 04:27:50 +00:00
Casey
7ad39bffcb Merge pull request #12262 from TheDavestDave/primative-shield-2
primative-shields
2022-02-19 04:02:45 +00:00
Casey
9c74404d02 reworks 'sword' crate 2022-02-18 18:58:07 +00:00
Casey
fdfa958555 Adds vendor refill cartridges to cargo 2022-02-14 21:36:39 +00:00
Casey
cfefb1098e Hastily gives the ERT their suits back 2022-02-07 23:17:22 +00:00
Rykka
b9e71c1017 Fixes Holodeck wind sounds 2022-02-07 14:46:18 -08:00
Rykka
40b8dd8611 Depreciates old wind sounds, adds new wind and replaces snowstorm/blizz
Replaces snowstorm, blizzard sounds with these.
TODO:
Waiting on soundfiles to allow for different exterior (more snowy) wind sounds, while the current wind will be used for the +interior+ wind SFX.
2022-02-07 11:31:06 -08:00
Rykka
fd232ce45c Update Ambient Sounds 3.0
Adds Lava/Water Idle sounds
Adds Snowbirds loops for use on Sif, currently meant to be looped
Adds better rain FX, gives storms their own FX too
Adds unused rumbly noises for underground
2022-02-07 11:31:06 -08:00
Nadyr
6e44bb7876 Merge branch 'master' into upstream-merge-12165 2022-02-06 21:53:14 -05:00
Casey
e6f02c05a6 The final Item Bank patch? 2022-02-06 23:29:28 +00:00
Casey
b77383ecce Merge pull request #12151 from PastelPrinceDan/catslugcrate
adds a catslug crate to cargo
2022-02-06 14:16:18 +00:00
Nadyr
0cd8c4569a Merge pull request #3591 from CHOMPStation2/upstream-merge-12092
[MIRROR] [MIRROR] Adds a roof to indoor rain sounds
2022-01-29 17:17:12 -05:00
Nadyr
656b477d19 Merge pull request #3203 from BlackMajor/cit-mobs
Porting a hefty chunk of Citadel mobs.
2022-01-29 17:09:18 -05:00
Casey
cf831798bd Merge pull request #12092 from VOREStation/upstream-merge-8369
[MIRROR] Adds a roof to indoor rain sounds
2022-01-28 22:20:30 +00:00
Nadyr
05f5e75b26 powder that makes you say yes 2022-01-22 10:43:43 -05:00
Novacat
501bff423f sword fix attempt three 2022-01-22 14:17:45 +00:00
Nadyr
1938a2ea4f powder that makes you say yes 2022-01-16 23:14:03 -05:00
Casey
dccd954ae4 I don't know why I need to set a name for the crate three times but I… 2022-01-14 18:44:04 +00:00
Nadyr
f62dfdbf4d Merge pull request #3524 from CHOMPStation2/upstream-merge-12042
[MIRROR] Sword crate
2022-01-09 20:57:34 -05:00
Nadyr
f4ad4ec873 Merge pull request #3521 from CHOMPStation2/upstream-merge-12048
[MIRROR] Fixes riding offsets not counting rider size
2022-01-09 20:53:39 -05:00
Nadyr
02fa3eba30 powder that makes you say yes 2022-01-09 20:48:24 -05:00
Casey
b60ad04452 Merge pull request #12016 from PastelPrinceDan/injectorslargo
makes large autoinjectors cheaper
2022-01-09 01:52:14 +00:00
Casey
3fa644b0d6 Sword crate 2022-01-09 01:49:54 +00:00
Casey
8ae533e3f1 Merge pull request #12048 from Verkister/ponyshow2
Fixes riding offsets not counting rider size
2022-01-09 01:49:29 +00:00