653d2b9179
Communicator UI Improvements + Camera Console Moving Camera Fixes (rebundled)
2021-02-14 08:51:59 -05:00
39292dfe36
Merge pull request #1291 from CHOMPStationBot/upstream-merge-9676
...
[MIRROR] Adds in 1 new eggs end 3 joke eggs.
2021-02-14 07:33:01 -05:00
83861014e7
Merge pull request #1308 from CHOMPStationBot/upstream-merge-9691
...
[MIRROR] [MIRROR] Allows custom-selection of posters
2021-02-14 07:09:52 -05:00
3f3e7c536f
Merge pull request #9691 from VOREStation/upstream-merge-7865
...
[MIRROR] Allows custom-selection of posters
2021-02-12 21:27:50 +00:00
113bf6356a
Merge pull request #9676 from H0lySquirr3l/master
...
Adds in 1 new eggs end 3 joke eggs.
2021-02-11 10:59:20 +00:00
ac8a77dd06
Merge pull request #9612 from VOREStation/upstream-merge-7839
...
[MIRROR] Fixed global_announce autospeaker
2021-02-10 10:11:30 +00:00
d3c7cc6040
New advanced Egg Release mechanics.
2021-02-01 19:35:41 +00:00
b7d964f87a
Merge pull request #1177 from CHOMPStationBot/upstream-merge-9604
...
[MIRROR] [MIRROR] Mech Appearance Update
2021-01-27 18:58:35 -07:00
99d137254d
Merge pull request #1196 from CHOMPStationBot/upstream-merge-9614
...
[MIRROR] Fixes hound belly expansion upgrade having wrong name in prosfab, tweaks tech reqs, makes name less wordy
2021-01-27 18:43:55 -07:00
f97d065119
Update tile_types.dm
2021-01-27 18:13:46 -07:00
8f0f6f804b
Update fifty_spawner_tiles.dm
2021-01-27 18:13:25 -07:00
0967736254
[MIRROR] Fixes sif forest grass, adds overgrowth tiles
2021-01-27 19:35:43 +00:00
2f8602243d
Merge pull request #9614 from Heroman3003/belly-cap-fix-rename
...
Fixes hound belly expansion upgrade having wrong name in prosfab, tweaks tech reqs, makes name less wordy
2021-01-27 02:24:52 +00:00
fe84e96797
Revert "Delete defib timer"
2021-01-24 22:48:39 -08:00
2fe77a59ac
Revert "fixing defib timer and adding surgery for that shit"
2021-01-24 22:46:10 -08:00
4156dd8085
fixing defib timer and adding surgery for that shit
2021-01-24 21:27:44 -08:00
5bbdccefa5
Revert "[MIRROR] Fixes defib timers being 10 times as long compared to intended."
2021-01-24 18:53:16 -08:00
a4c4d371db
Merge pull request #9604 from VOREStation/upstream-merge-7818
...
[MIRROR] Mech Appearance Update
2021-01-25 00:51:12 +00:00
d3f6cba62c
Merge pull request #1175 from Sharkmare/sahoc-rising
...
Readds all Sahoc items
2021-01-24 08:53:48 -08:00
3c541d7ecb
Merge pull request #1176 from Darlantanis/VoreSlug
...
Vore slug and forest turf fix
2021-01-24 08:46:49 -08:00
bdfcc014f7
Adding reset owner feature and modulus operandi ala cadyn
2021-01-24 17:43:25 +01:00
a2f77d1eb1
Fixes Sif forest turfs
2021-01-24 11:02:43 -05:00
39e0e9ce63
Readds all Sahoc items
...
The egg is back.
2021-01-24 16:43:03 +01:00
c5ae5ec866
Merge pull request #1134 from CHOMPStation2/cadyn-patch-5
...
Delete defib timer
2021-01-24 06:52:37 -08:00
4f9ed16579
Merge pull request #1165 from CHOMPStationBot/upstream-merge-9598
...
[MIRROR] Fixes defib timers being 10 times as long compared to intended.
2021-01-24 06:52:18 -08:00
5211edc9c0
Merge pull request #9573 from VOREStation/upstream-merge-7786
...
[MIRROR] Gadgets & Gizmos
2021-01-24 06:55:05 +00:00
57e1be6caa
Merge pull request #9598 from Heroman3003/defibfix
...
Fixes defib timers being 10 times as long compared to intended.
2021-01-24 06:34:15 +00:00
c05d687ec2
Update defib.dm
2021-01-19 19:15:27 -08:00
f6c3f5120d
Resolves #1081 Teleporter Hub Rebalance
...
Adds bluespace crystals to the required materials to build a teleporter hub, bringing it in line with the rest of telesci.
2021-01-19 02:01:23 -05:00
eeae872e0b
Adding item: Clustaur Grenade
...
Due to the importance of hydrating for a staffed crew, this item has been developed for optimal delivery of water.
Currently admin spawn only.
2021-01-17 00:24:50 -08:00
be3d2edf75
Update defib.dm
2021-01-16 22:40:20 -08:00
c68fc43808
Merge pull request #1120 from CHOMPStationBot/upstream-merge-9572
...
[MIRROR] [MIRROR] Sheet Recipe Unexclusivity.
2021-01-16 19:57:42 -05:00
ba393c28d8
Merge pull request #1098 from Sharkmare/master
...
Adding WHIP placeholder icon. Closes #1091
2021-01-16 16:50:17 -07:00
23181d86db
egg laying shenanigans go from local into object.
...
reeeeee
2021-01-15 14:59:52 -08:00
32f728a713
Merge pull request #9572 from VOREStation/upstream-merge-7824
...
[MIRROR] Sheet Recipe Unexclusivity.
2021-01-14 18:05:02 +00:00
69d2fa3387
Fixing typo
2021-01-09 01:35:46 +01:00
0e22771046
Fixing WHIP
...
Adds placeholder whip sprite for the whip, since virgo doesnt have it, we dont have it and by god im not looking for if it even existed or when.
2021-01-09 01:27:52 +01:00
601c842d13
Added Drakeborgs for sillicons along with plushies
2021-01-06 19:52:47 +00:00
f441be96b0
Merge pull request #1063 from CHOMPStationBot/upstream-merge-9520
...
[MIRROR] Ports Vox Plushie from Paradise
2021-01-03 21:57:39 -05:00
7e16cd134a
Merge pull request #9527 from VOREStation/upstream-merge-7780
...
[MIRROR] Adds a Whip.
2020-12-28 17:12:39 +00:00
d96a127b4a
Ports Vox Plushie from Paradise
2020-12-26 01:59:20 +00:00
fd7310af15
ITG IDs and a small Dauntless refit
2020-12-23 14:19:56 +00:00
750c1f140c
Merge pull request #1010 from CHOMPStationBot/upstream-merge-9455
...
[MIRROR] [MIRROR] RPED QoL Tweak(s)/Unimplemented RPED Variant
2020-12-19 18:29:07 -05:00
d15968eff6
Last Christmas!
...
Final adjustments to the presents!
New fat taur sprite with three colors and a vulp skullmask that totally doesnt look like Churo from Different (TM)! Sprites made by our good friend Blitzkrieg
Merry Christmas all!
2020-12-18 17:38:55 +01:00
7efe6f2cad
Auto stash before rebase of "CHOMPStation2/master"
2020-12-18 17:02:15 +01:00
9fb6636f71
Merge pull request #1029 from Shadowfire117/ExtraMas
...
Christmas time is once a year..
2020-12-17 19:04:30 -05:00
6b70b133ba
Christmas time is once a year..
...
Made changes to allow casino manual to fit into the casino wallet for easy reading.
Made Santa's sack! Only he can take presents from it!
Made the new presents have a nice wide selection of gifts, but chaos presents are disabled so far!
Fixed 'the cake' somewhat and made a grenade to spawn its components.
made Santa's coat.
made an overdrive version of the confetti gun.
2020-12-17 17:20:24 +01:00
2718d0bbbe
Merge pull request #1016 from Shadowfire117/ChristmasCasino
...
So this is Christmas...
2020-12-17 04:17:30 -05:00
b2dfb35c54
So this is Christmas...
...
Made fake presents for decoration purposes
Made fake snowfall effect for mood
Made advanced presents that have randomized size and shape, will have a bigger selection of possible gifts in update along with a rare chaos version that will have it's own smaller but much powerful items!
Made new id sprites and access cards for casino medical/security/engineering
Took the old girl out back and put her down, sorry Casino Ferry, you served us all well!
And a big big rework and remapping of casino and disabled it from round start to ease up on processing, sorry kids. No snooping the goods from now on!
2020-12-15 01:43:30 +01:00
6127c5d2e9
Merge pull request #9455 from VOREStation/upstream-merge-7784
...
[MIRROR] RPED QoL Tweak(s)/Unimplemented RPED Variant
2020-12-14 03:05:22 +00:00
Chompstation Bot