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

6184 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
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
BlackMajor
6189bb4dd5 Update tile_types_ch.dm 2022-03-16 19:58:00 +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
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
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
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
b721da62a1 A more elegant weapon from a more civlised age 2022-02-27 19:27:52 +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
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
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
Razgriz
02464b1b20 Merge pull request #3676 from CHOMPStation2/upstream-merge-12222 
[MIRROR] Uncapitalize curious crystal
 2022-02-16 14:27:36 -07:00
Razgriz
41832fdc16 Merge pull request #3670 from CHOMPStation2/upstream-merge-12210 
[MIRROR] [MIRROR] Cybernetic Augments and Sick Tats
 2022-02-16 14:26:02 -07:00
BlackMajor
0c942396f8 Update communicator.dm 2022-02-14 15:23:12 +13:00
Casey
c99308895a Merge pull request #12222 from Very-Soft/tinyedit 
Uncapitalize curious crystal
 2022-02-14 00:00:46 +00:00
Casey
d4c693378d Merge pull request #12210 from VOREStation/upstream-merge-8200 
[MIRROR] Cybernetic Augments and Sick Tats
 2022-02-13 21:48:53 +00:00
Razgriz
ea5b01ad69 Merge pull request #3653 from CHOMPStation2/upstream-merge-12191 
[MIRROR] strapless bag
 2022-02-13 01:31:20 -07:00
Razgriz
4c7db84cbf Merge pull request #3657 from CHOMPStation2/upstream-merge-12194 
[MIRROR] Fixes pouches
 2022-02-13 01:21:49 -07:00
Razgriz
ad2e88fdf6 Merge branch 'master' into upstream-merge-12191 2022-02-13 01:18:29 -07:00
Casey
36323b3b12 Merge pull request #12194 from ktccd0/ktccd-dev-Pouches-Fix 
Fixes pouches
 2022-02-11 22:20:28 +00:00
Casey
0319e46850 strapless bag 2022-02-11 21:36:25 +00:00
Casey
a503fa1c7f Merge pull request #12188 from Very-Soft/yeah! 
Size Standardization Bracelet
 2022-02-10 00:57:10 +00:00
Test Turtle
3c06b4dc19 Update to Sheet Materials 
While this doesn't revert all the changes upstream to the mining materials, it does replace most of them with sprites from other servers, which I feel are more appropriate here.
 2022-02-07 17:20:45 -08:00
Nadyr
524db7ba79 Merge pull request #3625 from CHOMPStation2/upstream-merge-12164 
[MIRROR] talon miner
 2022-02-06 21:58:06 -05:00
Nadyr
77f4e9fb63 Merge pull request #3627 from CHOMPStation2/upstream-merge-12144 
[MIRROR] exosuit cargo expansion equipment
 2022-02-06 21:51:00 -05:00
Nadyr
33403c6445 Merge branch 'master' into upstream-merge-12164 2022-02-06 21:38:32 -05:00
Casey
1eabc49fc5 Merge pull request #12144 from Hatterhat/special-compartment 
exosuit cargo expansion equipment
 2022-02-06 23:23:09 +00:00
Casey
80e943716f talon miner 2022-02-06 23:21:47 +00:00
Casey
56d47d2cc1 Item Bank fixy! 2022-02-06 15:46:27 +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