Commit Graph

2397 Commits

Author SHA1 Message Date
Verkister
86e18daa98 Update watercloset_vr.dm 2022-02-10 14:24:01 +02:00
Verkister
8f1bac9cdc Couple more flush tweaks.
Fixes an oversight of picking up or moving contents off the tile mid-animation not saving them from getting flushed.
Also makes it possible to flush small (unbuckled and knocked down) mobs up to 75% size :v
2022-02-10 14:20:56 +02:00
Verkister
15c9d5973a Instead of instantly just zapping the contents away, they now swirl the stuff around before making it vanish one item at a time, keeping the things contained for a 20 sec cooldown time before it gets zapped to the exit landmark, this serving as both, spam protection and a chance for the possible player victim to watch the action finish before they're bluespaced away.
Also makes the exit landmark use a new contained item retrieval system instead of just making a messy lagpile in the open. The machine also processes down certain things, these icluding foods, organs, and vore eggs, making the thing not be useful as a food vendor for your dear enemies, and popping open vore eggs so that nobody needs to end up blindly guessing mystery contents. Also the machine has a funny little feature to get rid of the unwanted contents as well. (SPOILERS: it's a "Muffin Monster" mode with a twist. The monster is an actual voremob contained within the machine, and if active, the contents will end up in its gut. Deactivating will release the contents back into the machine. Sounds like some sorta Bethesda level brainfart, right? But I did it on purpose for another even funnier feature: Emagging the machine while the mode is active will release the monster as a hostile mob lmao)

Not even gonna bother marking as chompedit for now cause it was already all my code and I doubt anyone else up there's gonna be touching the file and might just end up porting it there anyway if I somehow get a charitable urge to provide them with non-critical funfeatures again :v
2022-02-07 21:38:55 +02:00
Nadyr
33403c6445 Merge branch 'master' into upstream-merge-12164 2022-02-06 21:38:32 -05:00
Nadyr
03bae00061 Merge pull request #3616 from CHOMPStation2/upstream-merge-12151
[MIRROR] adds a catslug crate to cargo
2022-02-06 20:40:53 -05:00
Nadyr
4efce5f15f Merge pull request #3615 from CHOMPStation2/upstream-merge-12146
[MIRROR] skimpy cap "dress" probably more like a leotard idk
2022-02-06 20:36:30 -05:00
Casey
80e943716f talon miner 2022-02-06 23:21:47 +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
Casey
86ca5e5d49 Merge pull request #12146 from Hatterhat/formal-in-the-loosest-sense
skimpy cap "dress" probably more like a leotard idk
2022-02-06 14:15:06 +00:00
Casey
7f3da20187 Talon Improvements, Take 2 2022-02-06 14:07:23 +00: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
Novacat
6993d13559 Merge pull request #12080 from Heroman3003/lowall
Fixes wrench dropping when deconstructing low wall + allows normal climbing
2022-01-22 14:19:06 +00:00
Casey
9460986025 Merge pull request #12061 from Very-Soft/spoilers
Removes the announcement for main pred and morph spawns
2022-01-14 18:45:25 +00:00
Casey
e3e993aed6 Merge pull request #12030 from Heroman3003/artfix
Adjusts descriptions and flavor texts of painting frames
2022-01-09 01:50:51 +00:00
BlackMajor
6b4ccac9db many more fixes 2021-12-14 02:22:21 +13:00
Nadyr
970000bbc4 Merge pull request #3486 from CHOMPStation2/upstream-merge-12004
[MIRROR] Limits painting name length to 250 characters
2021-12-12 06:44:23 -05:00
Nadyr
1141e96505 Merge pull request #3295 from CHOMPStation2/upstream-merge-11975
[MIRROR] Door Interact Tweaks
2021-12-12 06:28:53 -05:00
Nadyr
dfdf720ee9 Merge pull request #3301 from CHOMPStation2/upstream-merge-11968
[MIRROR] Allows simplemobs climb ladders + trash pile interaction fix
2021-12-12 06:22:42 -05:00
Casey
5cefa8d4e3 department berets (mostly heads tbh) 2021-12-12 04:20:38 -05:00
Nadyr
bf5f98c728 Merge pull request #3427 from CHOMPStation2/upstream-merge-11815
[MIRROR] Adds catslug to maintpred options
2021-12-12 04:13:27 -05:00
Nadyr
62921c7b1a Merge pull request #3401 from CHOMPStation2/upstream-merge-11779
[MIRROR] Fixes infinite glass from low walls
2021-12-12 02:00:08 -05:00
Casey
2c122a8822 Merge pull request #12004 from Heroman3003/paintname-limit
Limits painting name length to 250 characters
2021-12-11 13:55:38 +00:00
Razgriz
af8834894b powder that makes you say yes 2021-12-10 00:55:04 -07:00
Casey
3d3fc07d0e Merge pull request #11877 from Heroman3003/glovening
Adds leather gloves to (xeno)botanist lockers
2021-12-10 06:12:10 +00:00
Casey
afcf943138 Adds catslug to maintpred options 2021-12-10 01:08:04 +00:00
CHOMPStation2
8324777d6e Powder that makes you say yes 2021-12-09 14:16:10 -07:00
Casey
2047a923b2 Merge pull request #11968 from Heroman3003/simplemob-clickfix
Allows simplemobs climb ladders + trash pile interaction fix
2021-12-08 04:18:02 +00:00
Casey
90c9ef5f3f Door Interact Tweaks 2021-12-08 04:17:15 +00:00
BlackMajor
dbb5a4083b more progress 2021-12-07 01:46:21 +13:00
Nadyr
1dc06fd9e6 Merge branch 'master' into upstream-merge-11928 2021-12-05 12:50:21 -05:00
Nadyr
cc9fa9282c powder that makes you say yes 2021-12-05 10:53:54 -05:00
Casey
fe8c4753eb Offmap Tweaks 2021-12-03 07:14:17 +00:00
Nadyr
19246dbed1 Merge pull request #3165 from CHOMPStationBot/upstream-merge-11722
[MIRROR] Hardwood Material Port
2021-10-30 23:30:40 -04:00
Chompstation Bot
da9e3383a8 Hardwood Material Port 2021-10-30 21:25:32 +00:00
Chompstation Bot
60de9a473c Stellar Delight! 2021-10-30 13:34:04 +00:00
Nadyr
e04d6162fc Merge pull request #3095 from CHOMPStationBot/upstream-merge-11544
[MIRROR] [MIRROR] Separates Swimsuit and Athletic Lockers, Adds Wetsuits
2021-10-22 19:51:36 -04:00
Nadyr
024c8d1dd0 Merge pull request #3090 from CHOMPStationBot/upstream-merge-11535
[MIRROR] Misc additions I made while sleep deprived
2021-10-22 19:46:46 -04:00
Aronai Sieyes
f2702c5455 Merge pull request #11544 from VOREStation/upstream-merge-8230
[MIRROR] Separates Swimsuit and Athletic Lockers, Adds Wetsuits
2021-10-22 18:24:49 +00:00
Ghost Actual
91fc1bd364 Misc additions I made while sleep deprived (#11535)
* Base Commit

* Small Fix

* Small Fix

* Small Fix
2021-10-22 17:49:28 +00:00
Verkister
2bccef7423 adds double upstreams too 2021-10-22 17:23:07 +03:00
Nadyr
53c15bd4f3 powder that makes you say yes 2021-09-28 23:41:35 -04:00
Chompstation Bot
a7365de5be Eng/Med Belts 2021-09-29 02:41:07 +00:00
Nadyr
7737c7ccf1 Merge pull request #3048 from CHOMPStationBot/upstream-merge-11546
[MIRROR] Adds more clothing from Polaris and various sources
2021-09-27 18:37:17 -04:00
Nadyr
ed2c4b3309 powder that makes you say yes 2021-09-27 17:51:06 -04:00
Chompstation Bot
ad57dfbb92 Adds more clothing from Polaris and various sources 2021-09-27 18:31:54 +00:00
Chompstation Bot
564efa888d Doors: Now With 100% More Politeness 2021-09-27 18:16:10 +00:00
Chompstation Bot
4dd3ea4d15 Overhauls Resin ability, deletes unused xeno sprites, fixes few things. 2021-09-24 03:19:02 +00:00
Rykka
ed798113d9 Compiler Fixes
Fixes in order:
- Removes List of defines in misc_ch.dm that are no longer used - they're defined here for the casino prize dispenser, making these obsolete:
![](https://i.imgur.com/8iCsb98.png)

- Fixes relative pathing in mecha_parts_ch.dm
- Fixes relative pathing in bodybag.dm
- Fixes relative pathing in sahoc_ch.dm
- Fixes relative pathing in toys_yw.dm
- Fixes def_zone being defined when only the variable was needed in twohanded_ch.dm
- Fixes relative pathing in trash_pile_vr_ch.dm
- Fixes clip_mask being missing in misc_ch.dm
- Fixes relative pathing in tesh_synth_facemask.dm
- Fixes absolute path being indented in by one (typo?)
- Fixes relative pathing in armor_yw.dm
- Fixes unreachable parent call in audible_scream_ch.dm
- Fixes VERM_LIZARDS being undefined when it wasn't defined, as VERM_LIZARDMEN was the variable being defined + used in mutants.dm
- Removes two un-needed parent calls - these procs have no parent on /obj/structure - thecake_ch.dm
- Fixes invalid kword nano_state in protean_blob.dm
- Fixes relative pathing in drone_manufacturer_unify.dm
- Fixes relative pathing in synx.dm
- Removes arguments of drop_item that don't exist (port was from TG and had force_drop = 1 and src defined.) - vox.dm
- Added vision_required = TRUE to fix proc argument missing - bigdragon_ch.dm
- Added include_robo = TRUE to fix argument missing in demon_ch.dm
- Fixes relative pathing in rakshasa_abilities.dm
- Adds comment to solargrub.dm, unable to fix operator overload error yet.
- Fixes relative pathing in sprite_accessories_extra_ch.dm
- Fixes relative pathing in sprite_accessories_yw.dm
- Fixes relative pathing in phase.dm
- Fixes relative pathing in bluespacecoffee.dm
- Fixes relative pathing in other_ch.dm
- Fixes relative pathing and ambigious ! in living_ch.dm
- Fixes relative pathing in custom_clothes_yw.dm
- Fixes relative pathing in custom_rigs_yw.dm
- Fixes relative pathing in MadokaSpear.dm
- Comments out duplicate #includes in southern_cross.dm as vorestation.dme has them #include'd.
2021-09-03 17:22:49 -07:00
Nadyr
0ccc8cf78e powder that makes you say yes 2021-08-27 20:07:14 -04:00
Nadyr
be5b7f3644 Merge pull request #2895 from CHOMPStationBot/upstream-merge-11466
[MIRROR] Expanding Clothing Options
2021-08-26 20:50:04 -04:00