Commit Graph

2602 Commits

Author SHA1 Message Date
Nadyr
531bb77df2 powder that makes you say yes 2022-06-22 23:56:48 -04:00
Nadyr
39e426b4c6 powder that makes you say yes 2022-06-22 23:56:05 -04:00
Casey
5788a26593 Input Fixes 2022-06-22 23:54:36 -04:00
Nadyr
a2d9c8b58a Merge branch 'master' into upstream-merge-13122 2022-06-22 22:37:44 -04:00
Nadyr
1b30469c6b Merge pull request #4383 from CHOMPStation2/upstream-merge-13114
[MIRROR] Adds Happy carpet
2022-06-22 22:33:37 -04:00
Nadyr
e81e1f4faf Merge branch 'master' into upstream-merge-13112 2022-06-22 21:58:12 -04:00
Nadyr
46ff42c250 Merge pull request #4371 from CHOMPStation2/upstream-merge-13103
[MIRROR] [MIRROR-FIX] Cooking QOL V2
2022-06-22 21:55:19 -04:00
Nadyr
5b75024c2f Merge branch 'master' into upstream-merge-13114 2022-06-22 21:47:19 -04:00
Casey
b0802ce267 More TGUI Input Conversions 2022-06-19 11:09:42 +00:00
Casey
928a321b5f TGUI Input Conversions 2022-06-19 03:59:14 +00:00
Casey
d4f8e75cd6 Adds Happy carpet 2022-06-19 03:59:10 +00:00
Casey
54279fa4de [MIRROR] Adds Some More Decorative Flooring Types 2022-06-19 00:44:42 +00:00
Novacat
47c92f2581 [MIRROR-FIX] Cooking QOL V2 2022-06-18 14:45:56 +00:00
Casey
f958518ea9 Merge pull request #13035 from lm40/nogods
localizes religion and adds custom chaplain titles
2022-06-04 16:38:53 +00:00
Casey
0b78f2647c Merge pull request #12953 from FartMaster69420/sleevecard-pai
Sleevecard simplification and features
2022-05-22 18:17:28 +00:00
Razgriz
e37400e1ac Merge pull request #3064 from Rykka-Stormheart/shep-dev-ambience-3.0
Update Ambient Sounds 3.0
2022-05-18 21:42:59 -07:00
Casey
61fce152d5 Merge pull request #12974 from foopwo/borgotoys
Adds a couple of new toys for cyborgs.
2022-05-15 20:15:29 +00:00
Razgriz
d7c6d66332 Merge branch 'master' into Cargo-crate-stuff 2022-05-14 14:41:35 -07:00
Novacat
4b4ba32e03 Merge pull request #12968 from Heroman3003/RUNTIME-FIX-END-ME
Fixes runtimes being broken. Removes back-worn watertanks. NO I DO NO…
2022-05-14 13:05:43 +00:00
LordSaladin
dd9b12a279 git should see it now 2022-05-05 18:42:43 +01:00
LordSaladin
9c853318d5 Create medical_ch.dm 2022-05-05 18:41:56 +01:00
LordSaladin
a29e570c4a fixes that check
ree
2022-05-05 18:29:44 +01:00
LordSaladin
2d7a4e16b6 Create medical_ch.dm 2022-05-05 18:28:58 +01:00
LordSaladin
1c69e41e9f Modular datums folder and examples
Adds a datums folder and a supplypack subfolder while moving over the existing medical_ch.dm and adding a munitions one which adds a cowboy crate because serdy bussed me in a colt once and this gives me an excuse to actually code and help out with the modularity.
2022-05-05 18:14:23 +01:00
Nadyr
5b8e8da291 Merge pull request #4191 from CHOMPStation2/upstream-merge-12869
[MIRROR] Dosimeters
2022-05-01 18:14:37 -04:00
Casey
87e00aff6f Merge pull request #12869 from ItsSelis/dosimeters
Dosimeters
2022-05-01 03:09:59 +00:00
Casey
4bba5d7238 Merge pull request #12851 from VOREStation/upstream-merge-8579
[MIRROR] Changeling Menu Now Shows Cost
2022-04-27 20:31:46 +00:00
BlackMajor
aeea4dfc9a Merge branch 'master' into protean-rework 2022-04-25 13:21:53 +12:00
Tasald
9962272e51 Exploration upgread (#4137)
* Add pathfinder to drop pouches

adds pathfinder to drop pouches so they can have them to.

* Revert "Add pathfinder to drop pouches"

* Revert "Revert "Add pathfinder to drop pouches""

* Exploration gear update

Adds missing standard items to exploration lockers so they arn't gimped.

* Update misc.dm

* PF locker update

Adds the plate carrier and exploration bags to pathfinder locker

* PF bags

Lets the pathfinder spawn with exploration bags instead of generic ones

* Binocs

Adds binocs to the list of items that can be stored in the belt

* Ecig addition

Adds the standard and alternative ecigs to the base load out. dun know if setting the price of the alt one two 2 is good or not.

* removes sharp things

takes out the duplicate knife and machete

* removes macete holster

* Update outfit_vr.dm

* Update misc.dm

* Update belt_vr.dm

* Update misc_vr.dm

* Update misc_vr.dm

* Update loadout_accessories.dm

* Update loadout_smoking.dm

* Update misc.dm
2022-04-21 23:45:03 -07:00
BlackMajor
4285553f90 Merge branch 'master' into protean-rework 2022-04-21 01:18:45 +12:00
BlackMajor
119b70776f Progress 2022-04-20 22:49:11 +12:00
Casey
6000ac1ded Merge pull request #12740 from VOREStation/upstream-merge-8535
[MIRROR] Dress Shirt Undershirts
2022-04-17 09:22:10 +00:00
Casey
3f3a075f97 Merge pull request #12687 from Heroman3003/nerfnd
Nerfs gravitons and morphium, adds lots of boards into autolathe
2022-04-09 04:21:25 +00:00
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