cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 05:52:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
68,547 Commits 7 Branches 0 Tags
9b51a9f97800a0d72f679f4a4f3018275160aeea
Commit Graph

19744 Commits

Author SHA1 Message Date
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
78d1725785 Merge pull request #12444 from BonniePandora/Atmos-Extinguisher-sprite-fix 
Atmos Extinguisher sprite fix
 2022-03-18 19:32:05 +00:00
Razgriz
8c3e65899f Merge pull request #3843 from CHOMPStation2/upstream-merge-12434 
[MIRROR] Small Pilot QoL additions
 2022-03-17 23:29:14 -07: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
Razgriz
df9d2f981c powder that makes you say no 2022-03-14 00:43:24 -07:00
Casey
9885711cd2 Small Pilot QoL additions 2022-03-13 20:05:54 +00: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
5d65974392 Merge pull request #3819 from CHOMPStation2/upstream-merge-12408 
[MIRROR] Don't announce dominated brains when leaving
 2022-03-11 15:55:12 -07:00
Razgriz
b01d409de6 Merge pull request #3828 from CHOMPStation2/master 
Merge master into 12392
 2022-03-11 15:21:48 -07:00
Casey
85858ccee3 Merge pull request #12408 from Very-Soft/dbannounce 
Don't announce dominated brains when leaving
 2022-03-09 22:36:18 +00: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
40ab4d17f2 Merge pull request #3747 from CHOMPStation2/upstream-merge-12319 
[MIRROR] Trader!
 2022-03-01 01:20:01 -07:00
Razgriz
84cead2db5 Merge pull request #3752 from CHOMPStation2/upstream-merge-12246 
[MIRROR] Fixes compile warning on main branch
 2022-03-01 00:59:55 -07:00
Razgriz
e173c36f6b Merge pull request #3748 from CHOMPStation2/upstream-merge-12323 
[MIRROR] Fixes arcades not being deconstructable
 2022-03-01 00:57:00 -07:00
Razgriz
c57ef19032 Merge branch 'master' into upstream-merge-12319 2022-03-01 00:53:31 -07:00
Razgriz
bb31e5e40b Merge pull request #3743 from CHOMPStation2/upstream-merge-12313 
[MIRROR] Adjusts some dirt!
 2022-03-01 00:48:12 -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
1a7fce2f39 Merge pull request #3728 from CHOMPStation2/upstream-merge-12296 
[MIRROR] gives qm/pf request console announcement access
 2022-03-01 00:35:54 -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
Razgriz
f90e935687 Merge pull request #3722 from CHOMPStation2/upstream-merge-12292 
[MIRROR] 8316 fix
 2022-03-01 00:29:44 -07:00
Razgriz
c02bbf5b11 Update turf_changing.dm 2022-03-01 00:12:12 -07:00
Razgriz
30f1886e52 Update turf.dm 2022-03-01 00:05:27 -07:00
Razgriz
a8fe7a125f Update walls.dm 2022-02-28 23:59:31 -07:00
Razgriz
b6022e0639 powder that makes you say yes 2022-02-28 23:53:01 -07:00
Razgriz
0f5f695315 Accept PR changes and add chomp comments 2022-02-28 23:47:10 -07:00
Razgriz
27c70d1b29 Accept pr changes and adds chomp comments 2022-02-28 23:46:04 -07:00
Razgriz
490fc3beaa Accepts changes from PR and adds chomp comments 2022-02-28 23:43:45 -07:00
Razgriz
15f43a90e1 Fix the ChangeTurf improvements PR, 3725 2022-02-28 23:33:34 -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
45ad26c15b Merge pull request #12246 from Heroman3003/warning-fix 
Fixes compile warning on main branch
 2022-02-26 09:12:10 +00:00
Casey
2f37736638 Merge pull request #12323 from Heroman3003/arcadefix 
Fixes arcades not being deconstructable
 2022-02-25 23:36:55 +00:00
Casey
a2646d37c5 Merge pull request #12319 from Very-Soft/trader 
Trader!
 2022-02-25 19:58:15 +00:00
Casey
5336fd9912 Merge pull request #12313 from Very-Soft/dirttime 
Adjusts some dirt!
 2022-02-23 01:53:59 +00:00
Casey
b77105f6fe Merge pull request #12296 from Hatterhat/rc-ann-pf-qm 
gives qm/pf request console announcement access
 2022-02-20 06:29:06 +00:00