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
74,075 Commits 7 Branches 0 Tags
11bdec15814b00d62c35146cab6501b978e30e02
Commit Graph

50645 Commits

Author SHA1 Message Date
TheGreatKitsune
11bdec1581 Fixes autosleever compatibility to match normal resleever 2023-03-31 10:07:09 -05:00
Rykka Stormheart
e601048e13 Fixes error with Species Sounds 
Unset ran into an error that did not occur during testing - select_default_species_sound was changed to use pref instead of user, and the testing calls were not updated.

Unathi had no species sounds.
 2023-03-23 05:10:29 -07:00
Razgriz
7fd46a4844 Merge pull request #5979 from Seris02/badsimplecorpses 
changes the getmobs list to show mobs that have or had a client first
 2023-03-22 14:37:04 -07:00
Razgriz
4718e71c85 Merge pull request #5977 from Seris02/jellyfishnooo 
stops 'the space jellyfish bonks the window harmlessly. x1762'
 2023-03-22 14:36:42 -07:00
Razgriz
c3ce02d546 Merge pull request #5976 from Sharkmare/patch-21 
Brings Communicators further in line with DPAs
 2023-03-22 14:36:26 -07:00
Razgriz
c057f9f0f8 Merge pull request #5813 from Rykka-Stormheart/shep-dev-barky-noises 
Sound Update: Mob Species Sounds (Gasp/Scream/Pain/Death/Cough/Sneeze)
 2023-03-22 14:32:04 -07:00
Razgriz
d90fcd43ae Merge pull request #5840 from Rykka-Stormheart/shep-dev-mob-injury-system 
Simplemob Injury System
 2023-03-22 14:31:53 -07:00
BlackMajor
9116dd344e Merge pull request #5980 from Seris02/traitfix 
fixes trait prefs from not working on chompcode
 2023-03-22 14:51:01 +13:00
Casey
b32bdc8fbe Merge pull request #14719 from Seris02/traitprefsbuttheyactuallywork 
fixes trait prefs not working and makes a trait pref for stuffing feeder
 2023-03-21 21:51:27 +00:00
Seris02
fe824561b0 fixes trait prefs from not working on chompcode 2023-03-21 12:43:38 +08:00
Seris02
cc3ab6e307 changes the getmobs list to show mobs that have or had a client first 2023-03-20 18:06:57 +08:00
Nadyr
92a7f6ca55 Merge pull request #5975 from CHOMPStation2/upstream-merge-14718 
[MIRROR] Adds a mob to gold extract pool
 2023-03-20 01:50:33 -04:00
Nadyr
e6c049ef47 Merge pull request #5970 from CHOMPStation2/upstream-merge-14676 
[MIRROR] Mob tweaks and fixes
 2023-03-20 01:50:02 -04:00
Seris02
08b5274a95 the jellyfish bonks the window harmlessly.x1762 2023-03-20 12:42:03 +08:00
Sharkmare
56b320d093 comment 2023-03-19 20:56:49 +01:00
Sharkmare
41e8e1fa4b Brings Communicators further in line with DPAs 
Allows mounting Comm watches to the belt and ID slot just like the regular communicator (just like the wrist mounted PDA)
 2023-03-19 20:45:59 +01:00
Casey
bec0b21aee Merge pull request #14718 from Heroman3003/goldupdate 
Adds a mob to gold extract pool
 2023-03-19 18:29:05 +00:00
Nadyr
1c4d605536 Merge pull request #5972 from CHOMPStation2/upstream-merge-14707 
[MIRROR] Should fix props being un-var-editable
 2023-03-19 08:58:41 -04:00
Nadyr
2dda11b280 powder that makes you say yes 2023-03-19 08:56:21 -04:00
Nadyr
c64e07aa8e Merge pull request #5969 from CHOMPStation2/upstream-merge-14700 
[MIRROR] Various weather and firework related cleanup and adjustments
 2023-03-19 08:54:07 -04:00
Nadyr
53bc6f3a2d Merge pull request #5968 from CHOMPStation2/upstream-merge-14714 
[MIRROR] Scary sounds are scary
 2023-03-19 08:51:13 -04:00
Nadyr
8a1c1b2243 Merge pull request #5967 from Seris02/gargoyleefficiency 
better gargoyle code
 2023-03-19 08:50:15 -04:00
Nadyr
d26efab377 Merge pull request #5964 from Sharkmare/patch-20 
Adding an ID slot to the Communicator
 2023-03-19 08:40:37 -04:00
Nadyr
b32b0bc4cd Merge pull request #5962 from CHOMPStation2/upstream-merge-14702 
[MIRROR] Fixes some bugs/QoL with guest pass terminals
 2023-03-19 08:40:22 -04:00
Casey
2e3d51e095 Merge pull request #14707 from Heroman3003/propvaredit 
Should fix props being un-var-editable
 2023-03-18 21:01:44 +00:00
Casey
884f772c49 Mob tweaks and fixes 2023-03-18 20:56:26 +00:00
Casey
02ee5608f1 Merge pull request #14700 from Heroman3003/weather-fixes-changes 
Various weather and firework related cleanup and adjustments
 2023-03-18 20:56:21 +00:00
Casey
19b70af7a1 Merge pull request #14714 from Very-Soft/scawwySownds 
Scary sounds are scary
 2023-03-18 20:54:10 +00:00
Seris02
8d87b153d7 the one bit of code I didn't check if it compiled 2023-03-18 20:22:46 +08:00
Seris02
0b984ee2fd nevermind on getting rid of the hardcoded layer ref 2023-03-18 20:17:19 +08:00
Seris02
985ab0309d better defines 2023-03-18 20:13:10 +08:00
Seris02
fb677ceee1 better gargoyle code 2023-03-18 19:56:35 +08:00
Seris02
678d7b3d27 should fix spider population bombs from them eating themselves, and cocoon bombs 2023-03-18 12:57:43 +08:00
Nadyr
b259cb47ef Merge pull request #5963 from CHOMPStation2/upstream-merge-14678 
[MIRROR] Frozen Organ Crates
 2023-03-17 20:40:00 -04:00
Nadyr
2487412774 powder that makes you say yes 2023-03-17 20:38:35 -04:00
Nadyr
b495f5619f Merge pull request #5949 from Sharkmare/patch-16 
Adjusting recycling costs [lower]
 2023-03-17 20:37:32 -04:00
Kassc
099f7c08ad Merge pull request #5864 from Sharkmare/patch-10 
Raising point gain from blindness
 2023-03-17 18:56:27 -04:00
Sharkmare
e9d6549533 lowered based on feedback 2023-03-17 23:44:55 +01:00
Sharkmare
c534b87867 Update recycling.dm 2023-03-17 23:40:45 +01:00
Sharkmare
c42510c309 Adding an ID slot to the Communicator 
Allows you to slot your scanned ID into your communicator
 2023-03-17 23:15:56 +01:00
Heroman3003
d2543ddf47 Merge pull request #14678 from KillianKirilenko/kk-talontweaks 
Frozen Organ Crates
 2023-03-17 21:05:28 +00:00
Heroman3003
ef93cdb6e0 Fixes some bugs/QoL with guest pass terminals 2023-03-17 21:04:21 +00:00
Nadyr
b582a862b9 Merge pull request #5954 from CHOMPStation2/upstream-merge-14517 
[MIRROR] [MIRROR] Adds fog as a weather. It's cold.
 2023-03-17 04:09:02 -04:00
Rykka Stormheart
142e04b563 Merge branch 'master' into shep-dev-mob-injury-system 2023-03-17 01:08:39 -07:00
Nadyr
26354a48fd Merge pull request #5961 from BlackMajor/master 
Nerfs submachine gun. Cuts the damage by 1/3
 2023-03-17 04:07:13 -04:00
Nadyr
bdd820b38b Merge pull request #5952 from HatArchAzel/master 
Adds new prosthetic body and fixes digitigrade clothes hiding hands
 2023-03-17 04:04:05 -04:00
Nadyr
25ef364bd2 Merge pull request #5960 from CHOMPStation2/upstream-merge-14701 
[MIRROR] Shuttle Bay signs
 2023-03-17 04:03:28 -04:00
Nadyr
c74dd3431a Merge pull request #5958 from Sharkmare/patch-19 
Jar + Small people
 2023-03-17 04:02:25 -04:00
Nadyr
e3e765c599 Merge pull request #5957 from Sharkmare/patch-18 
No shoes shoe option
 2023-03-17 04:01:26 -04:00
Nadyr
a9ab79d6fd powder that makes you say yes 2023-03-17 03:56:14 -04:00