Commit Graph

2456 Commits

Author SHA1 Message Date
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
Nadyr
cecfa38e2b Merge pull request #2913 from CHOMPStationBot/upstream-merge-11499
[MIRROR] [MIRROR] Ports sliding things along tables
2021-08-26 20:49:20 -04:00
Nadyr
38b64164ae Merge pull request #2900 from CHOMPStationBot/upstream-merge-11493
[MIRROR] [MIRROR] Sleep Tight Disky
2021-08-26 20:42:32 -04:00
Aronai Sieyes
99d4db145d Merge pull request #11499 from VOREStation/upstream-merge-8233
[MIRROR] Ports sliding things along tables
2021-08-26 20:17:48 +00:00
Aronai Sieyes
46c1fc90d1 Merge pull request #11493 from VOREStation/upstream-merge-8241
[MIRROR] Sleep Tight Disky
2021-08-26 16:53:03 +00:00
Chompstation Bot
3a63117151 Expanding Clothing Options 2021-08-26 15:44:22 +00:00
Chompstation Bot
af0d7a0f6b Make stack amount var private 2021-08-26 15:39:04 +00:00
Nadyr
145f8172f4 Merge pull request #2843 from CHOMPStationBot/upstream-merge-11464
[MIRROR] Stun Revolver Fix
2021-08-25 23:42:35 -04:00
Nadyr
454b7c25db Merge pull request #2889 from CHOMPStationBot/upstream-merge-11483
[MIRROR] Adds the ability to ban people from ghost roles
2021-08-25 23:38:36 -04:00
Nadyr
67eaef4886 Merge branch 'master' into upstream-merge-11464 2021-08-25 23:32:47 -04:00
Nadyr
f19dc1b2eb Merge pull request #2874 from cadyn/upstream-merge-11421
Merge Upstream Pull Request 11421
2021-08-25 22:38:53 -04:00
Nadyr
779c8ab9e6 Merge pull request #2869 from cadyn/upstream-merge-11412
Merge Upstream Pull Request 11412
2021-08-25 22:01:13 -04:00
Nadyr
0d3076d6b4 Merge pull request #2867 from cadyn/upstream-merge-11408
Merge Upstream Pull Request 11408
2021-08-25 21:59:52 -04:00
Nadyr
e0b3a41696 powder that makes you say yes 2021-08-25 21:46:16 -04:00
Nadyr
e142d328ee powder that makes you say yes 2021-08-25 21:43:39 -04:00
Nadyr
ad5441a144 powder that makes you say yes 2021-08-25 21:25:20 -04:00
Nadyr
835c587224 Merge pull request #2866 from cadyn/upstream-merge-11404
Merge Upstream Pull Request 11404
2021-08-25 21:23:07 -04:00
Chompstation Bot
aba07d1109 Adds the ability to ban people from ghost roles 2021-08-25 13:18:40 +00:00
Aronai Sieyes
72f5e790db Upstream-11421 2021-08-24 21:10:20 -07:00
Aronai Sieyes
6eb1da72db Upstream-11412 2021-08-24 21:09:52 -07:00
Aronai Sieyes
e19a87e44a Upstream-11408 2021-08-24 21:09:43 -07:00
Aronai Sieyes
ed4e55f811 Merge pull request #11404 from VOREStation/Arokha/fridge
Fridge/wall locker animation fixes
2021-08-24 21:09:22 -07:00
Nadyr
88ea62510a Merge branch 'master' into upstream-merge-11459 2021-08-24 23:23:57 -04:00
Nadyr
a7af370a6d powder that makes you say yes 2021-08-24 23:17:52 -04:00
Aronai Sieyes
c1632a1c71 Merge pull request #11439 from PastelPrinceDan/rdlabcoat
Ports RD labcoat from CitRP
2021-08-24 23:06:09 -04:00
Chompstation Bot
e209b4cfb2 Adds winter coats to their respective lockers/vendors 2021-08-24 23:59:02 +00:00
Chompstation Bot
593dd3ea79 Stun Revolver Fix 2021-08-24 23:58:41 +00:00
Chompstation Bot
f5212e0053 Fix Salamanders and Wall-lockers 2021-08-13 15:40:58 +00:00
Aronai Sieyes
4a39834222 Merge pull request #11385 from Very-Soft/maintpredintro
Adds extra text to maint pred and morph spawns
2021-08-10 23:12:09 +00:00
Aronai Sieyes
7463a1bd6e Merge pull request #11368 from VOREStation/Arokha/closetanim
Port of monster860's animated doors to Bay closets
2021-08-09 03:28:57 +00:00
Aronai Sieyes
a66ac79179 Merge pull request #11336 from VOREStation/Icons/skyratexting
Skyrat extinguisher cabinet sprites
2021-08-06 15:36:06 +00:00
Aronai Sieyes
b93b572626 Merge pull request #11331 from VOREStation/Icons/skyratbenches
Skyrat benches
2021-08-04 02:50:20 +00:00
Nadyr
aa3c056af6 powder that makes you say yes 2021-08-01 15:11:58 -04:00
Chompstation Bot
4090222cda Janitor Equipment Fix 2021-08-01 14:45:35 +00:00
Nadyr
3f19639e03 powder that makes you say yes 2021-07-28 18:58:49 -04:00
Chompstation Bot
d4c6afa5af Remove atom/Uncross override 2021-07-28 20:43:23 +00:00
Aronai Sieyes
5d6d45904d Merge pull request #11259 from VOREStation/Arokha/dropfix
AAAAAA
2021-07-26 21:24:07 +00:00
Chompstation Bot
f97dfc5dea More TGMC Ports 2021-07-25 21:45:48 +00:00
Nadyr
03e7614962 Merge pull request #2650 from CHOMPStationBot/upstream-merge-11229
[MIRROR] [MIRROR] Sign Oh Sure
2021-07-25 02:42:24 -04:00
Nadyr
871550539f Merge pull request #2648 from CHOMPStationBot/upstream-merge-11227
[MIRROR] Improve admin spawn features
2021-07-24 23:52:07 -04:00
Chompstation Bot
3e3d82a363 [MIRROR] Sign Oh Sure 2021-07-24 18:12:50 +00:00
Chompstation Bot
8b01c674d0 Improve admin spawn features 2021-07-24 17:05:36 +00:00