cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-28 10:12:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
68,580 Commits 8 Branches 0 Tags
ee62bdeb4eb951331501f4e743c2dfdff50032ea
Commit Graph

10044 Commits

Author SHA1 Message Date
Razgriz
d6f29b9507 Merge pull request #3861 from CHOMPStation2/upstream-merge-12449 
[MIRROR] Adds a choice between shotguns available to wardens.
 2022-03-18 18:52:10 -07:00
Razgriz
9b51a9f978 Merge pull request #3690 from harry3124/Yuliy-Gateway-Snowfield_1 
Re-opening Gateway/Snowfield Update
 2022-03-18 18:45:20 -07:00
Casey
2b3bb75044 Merge pull request #12449 from BonniePandora/Warden's-delight 
Adds a choice between shotguns available to wardens.
 2022-03-18 19:34:18 +00:00
Casey
78d1725785 Merge pull request #12444 from BonniePandora/Atmos-Extinguisher-sprite-fix 
Atmos Extinguisher sprite fix
 2022-03-18 19:32:05 +00:00
Razgriz
5eb06cab19 Merge pull request #3853 from BlackMajor/tilen't 
Fixes infinite tile material loop
 2022-03-16 00:21:11 -07:00
BlackMajor
6189bb4dd5 Update tile_types_ch.dm 2022-03-16 19:58:00 +13:00
BlackMajor
d88935eda7 Update mob_spawner_ch.dm 2022-03-16 19:09:27 +13:00
Casey
765f4cd2b3 More Upgrade Modules for Borgs 2022-03-12 20:44:57 +00:00
Casey
da32f1ce86 Merge pull request #12422 from Verkister/patch-109 
Fixes zaddat lunchbox adding extra hypos on loadout survival lunchbox
 2022-03-12 17:28:41 +00:00
Razgriz
b01d409de6 Merge pull request #3828 from CHOMPStation2/master 
Merge master into 12392
 2022-03-11 15:21:48 -07: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
de6e5c4932 Merge pull request #12382 from BonniePandora/Atmosia-Improvements 
Minor Atmos-tech QoL & new hazard vest
 2022-03-07 08:36:25 +00:00
Razgriz
b92b7821a2 Fix runtime for mob headsets 
Deleted two unnecessary lines because mobs don't have L and R ears.
 2022-03-06 18:32:18 -07:00
Razgriz
2dfde8b21b Merge pull request #3791 from CHOMPStation2/Razgriz1032-patch-5 
Remove headset sound effect for simple_mob
 2022-03-06 15:12:36 -07:00
Razgriz
efa8c4b68d Update headset.dm 2022-03-05 15:47:53 -07:00
Razgriz
c09ad1baa9 powder that makes you say yes and hate the map changes 2022-03-04 15:23:33 -07:00
Razgriz
8ce6dcf1c5 Remove headset sound effect for simple_mob 
This will remove the headset sound effect for mobs, so that way if during an event, a stealthy mob has a mob_headset, it won't make any radio noise whenever a transmission occurs and so that other players won't hear it.

Tested for simple mobs and confirmed simple mobs will not make static noise while carbons will still hear it.
 2022-03-04 14:32:19 -07:00
Casey
80f5298a18 Ammo Boxes 2022-03-03 21:23:43 +00:00
Casey
68c0ed10a7 Merge pull request #12356 from Very-Soft/persistchange 
Change painting persist decay
 2022-03-02 06:08:02 +00:00
Razgriz
fb37b47e11 Merge pull request #3765 from CHOMPStation2/upstream-merge-12333 
[MIRROR] [MIRROR] Fixes non-growing spiderlings growing.
 2022-03-01 01:36:13 -07:00
Razgriz
af7a89b7c6 Merge pull request #3761 from CHOMPStation2/upstream-merge-12321 
[MIRROR] A more elegant weapon from a more civlised age
 2022-03-01 01:35:44 -07:00
Razgriz
263b6468a6 Merge pull request #3753 from CHOMPStation2/upstream-merge-12330 
[MIRROR] THERE WILL BE BLOOD. SHED.
 2022-03-01 01:35:30 -07:00
Razgriz
c57ef19032 Merge branch 'master' into upstream-merge-12319 2022-03-01 00:53:31 -07:00
Razgriz
43bfaed740 Merge pull request #3720 from CHOMPStation2/upstream-merge-12288 
[MIRROR] [ready] pastelprincedan plushie fluff item
 2022-03-01 00:39:21 -07:00
Razgriz
e90f53c2cb Merge pull request #3727 from CHOMPStation2/upstream-merge-12295 
[MIRROR] Item Bank - Do not store things crafted from material stacks
 2022-03-01 00:35:04 -07:00
Casey
c9e34e6e2a Merge pull request #12333 from VOREStation/upstream-merge-8356 
[MIRROR] Fixes non-growing spiderlings growing.
 2022-02-27 20:08:22 +00:00
Casey
b721da62a1 A more elegant weapon from a more civlised age 2022-02-27 19:27:52 +00:00
Casey
0eaeb0f368 THERE WILL BE BLOOD. SHED. 2022-02-26 09:12:15 +00:00
Casey
a2646d37c5 Merge pull request #12319 from Very-Soft/trader 
Trader!
 2022-02-25 19:58:15 +00:00
Nadyr
59090266bd Merge pull request #3717 from CHOMPStation2/upstream-merge-12286 
[MIRROR] Merge Fixes for 8222
 2022-02-19 20:51:16 -05:00
Nadyr
8f5bd593ba Merge branch 'master' into upstream-merge-12288 2022-02-19 20:48:23 -05:00
Casey
780499fff6 Merge pull request #12295 from Very-Soft/stackpersist 
Item Bank - Do not store things crafted from material stacks
 2022-02-20 01:36:58 +00:00
Nadyr
23f9e5828b Merge pull request #3701 from CHOMPStation2/upstream-merge-12247 
[MIRROR] Fixes sofa paths
 2022-02-19 20:34:07 -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
f36f32e7d8 forgot the crossbow changed too 2022-02-19 19:25:19 -05:00
Nadyr
cc600eeec0 change old crossbow ammo path 2022-02-19 19:19:26 -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
97cf4ce634 Merge pull request #3681 from CHOMPStation2/upstream-merge-12233 
[MIRROR] Heavy-duty Engineer's Gloves
 2022-02-19 18:15:45 -05:00
Casey
dc837b05b4 [ready] pastelprincedan plushie fluff item 2022-02-19 22:06:21 +00:00
Casey
592777ba9b Merge Fixes for 8222 2022-02-19 22:04:54 +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
7a786393f4 Merge pull request #12278 from Very-Soft/capcrysfix 
Fix a runtime with capture crystals
 2022-02-18 23:46:08 +00:00
Casey
8bfa8b09ab Fixes sofa paths 2022-02-18 19:05:41 +00:00
Razgriz
b0282d8d1b Merge pull request #3693 from CHOMPStation2/upstream-merge-12256 
[MIRROR] Sizegun Revamp 2022
 2022-02-17 17:38:01 -07:00
Razgriz
9966377da6 Merge pull request #3684 from CHOMPStation2/upstream-merge-12242 
[MIRROR] Now's your chance to be a [BIG SHOT]
 2022-02-17 17:34:00 -07:00
Casey
9b6517106b Merge pull request #12256 from GhostActual/sizegun-revamp-2022 
Sizegun Revamp 2022
 2022-02-17 20:32:45 +00:00
BlackMajor
f673cf2261 fixed some stuff. Not all of it yet. 2022-02-17 23:55:34 +13:00
harry3124
c99270b5b1 Re-opening Gateway/Snowfield Update 
All previous work progress lost, simply re-opening from

https://github.com/CHOMPStation2/CHOMPStation2/pull/3288#issue-1073079856
 2022-02-17 14:06:25 +09:00
Razgriz
02464b1b20 Merge pull request #3676 from CHOMPStation2/upstream-merge-12222 
[MIRROR] Uncapitalize curious crystal
 2022-02-16 14:27:36 -07:00