cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,320 Commits 6 Branches 0 Tags
44dbef245c762faff437fe2ddf15602c03bccd46
Commit Graph

53320 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
KasparoVy
44dbef245c Add a Couple Nevrean Tails, Remove Duplicate 
Adds a couple dual-colour Nevrean tails.

Also WTF is up with the extremely colourful monkey tail
 2020-06-19 02:54:55 -04:00
Novacat
b4014a79c9 Merge pull request #8309 from KillianKirilenko/kk-misc 
Prevent Refitting AutoLok Suits
 2020-06-18 19:19:07 -04:00
Killian
b49531447c Update suit_storage_unit.dm 2020-06-18 23:47:57 +01:00
Novacat
a1237915e5 Merge pull request #8237 from lbnesquik/Kot-Clothes-Tweak 
Slash clothes prices in half or more.
 2020-06-18 12:09:30 -04:00
Killian
7983ba422b Update suit_storage_unit.dm 2020-06-18 12:26:14 +01:00
lbnesquik
41f476a19f Finally done with it? 2020-06-18 09:38:14 +02:00
Novacat
261887a585 Merge pull request #8307 from SweetBlueSylveon/Bulldog-fix-(for-real-tho) 
Quickfix
 2020-06-18 03:18:27 -04:00
SweetBlueSylveon
24588306f0 DMM2TGM 2020-06-17 21:50:26 -07:00
SweetBlueSylveon
6cf4275e52 Quickfix 
Fixes bulldox, puts a cluwne on the guttersite properly, and fixes a spelling error.
 2020-06-17 21:49:05 -07:00
Novacat
39855fa728 Merge pull request #8304 from knoxon1/zenasuit 
Fixes a few missing pixels on Zena's Shroud Suit
 2020-06-17 21:28:41 -04:00
knoxon1
89002caa99 Update custom_clothes_vr.dmi 2020-06-16 20:24:13 -05:00
Novacat
67ca6c5bd2 Merge pull request #8302 from Heroman3003/fair-swap-lizard 
Makes Unathi's mob_size MOB_MEDIUM to match all other (non event) species
 2020-06-16 20:34:09 -04:00
Aronai Sieyes
c46aa55197 Merge pull request #8303 from VOREStation/Arokha/fixcase 
Fix casing on folder
 2020-06-16 18:51:01 -04:00
Arokha Sieyes
3a5d085af2 Fix casing on folder 2020-06-16 18:19:31 -04:00
Heroman
56c79c2c6e Makes Unathi's mob_size MOB_MEDIUM to match all other species 2020-06-17 07:19:06 +10:00
Novacat
7c55becc24 Merge pull request #8296 from VOREStation/upstream-merge-7282 
[MIRROR] Add the Aurora Caelus Event!
 2020-06-16 14:57:48 -04:00
Novacat
6d3a0c6298 Update aurora_caelus.dm 2020-06-16 08:36:44 -04:00
Novacat
f7979eb0b7 Merge pull request #8301 from VOREStation/upstream-merge-7289 
[MIRROR] Give rock turfs radiation blocking capabilities.
 2020-06-16 08:35:21 -04:00
Novacat
395d1d8b63 Merge pull request #8300 from VOREStation/upstream-merge-7287 
[MIRROR] Make gloves half as expensive.
 2020-06-16 08:35:05 -04:00
Novacat
a748772aa8 Merge pull request #8298 from VOREStation/upstream-merge-7285 
[MIRROR] Fixes a crash exploit.
 2020-06-16 08:34:42 -04:00
Novacat
db7c1121f0 Merge pull request #8297 from VOREStation/upstream-merge-7286 
[MIRROR] Combo damage type repair.
 2020-06-16 08:34:27 -04:00
Novacat
fe58fb5aab Merge pull request #8295 from VOREStation/upstream-merge-7283 
[MIRROR] Generalizes supply points per material sheet to the material datum.
 2020-06-16 08:34:11 -04:00
Novacat
4fb5ae64b6 Merge pull request #8294 from VOREStation/upstream-merge-7281 
[MIRROR] Fix Penetrating Bullet Double-Jeopardy
 2020-06-16 08:33:51 -04:00
VirgoBot
97d12656c7 Give rock turfs radiation blocking capabilities. 2020-06-16 03:34:38 -04:00
Atermonera
c95c01705a Merge pull request #7289 from Cyantime/patch-2 
Give rock turfs radiation blocking capabilities.
 2020-06-16 03:34:38 -04:00
VirgoBot
7bffca897c Make gloves half as expensive. 2020-06-16 03:33:25 -04:00
Atermonera
e3a8e9c7a5 Merge pull request #7287 from lbnesquik/Kot-Loadout-tweak 
Make gloves half as expensive.
 2020-06-16 03:33:24 -04:00
VirgoBot
826ec6e9c9 Fixes a crash exploit. 2020-06-16 03:31:56 -04:00
Atermonera
678f441458 Merge pull request #7285 from BlackMajor/patch-1 
Fixes a crash exploit.
 2020-06-16 03:31:56 -04:00
VirgoBot
c66a553432 Combo damage type repair. 2020-06-16 03:31:44 -04:00
Atermonera
6fe7876224 Merge pull request #7286 from Mechoid/FixComboDamage 
Combo damage type repair.
 2020-06-16 03:31:44 -04:00
Atermonera
99db1990bc Add the Aurora Caelus Event! 2020-06-16 03:29:26 -04:00
VirgoBot
0d5b84ace9 Generalizes supply points per material sheet to the material datum. 2020-06-16 03:29:13 -04:00
Atermonera
9957da080d Merge pull request #7283 from MistakeNot4892/supmat 
Generalizes supply points per material sheet to the material datum.
 2020-06-16 03:29:13 -04:00
VirgoBot
9f91bd8789 Fix Penetrating Bullet Double-Jeopardy 2020-06-16 03:25:48 -04:00
Atermonera
69ac9d894f Merge pull request #7281 from Mechoid/BulletPenFix 
Fix Penetrating Bullet Double-Jeopardy
 2020-06-16 03:25:47 -04:00
SweetBlueSylveon
bf5d9f1fc8 NanoUI tweak (#8268) 
* Machines can't be used by clowns.

The old system was unfair, only the carbons or the silicons amongst us were allowed to use computers or see the internet. Or adjust the thermostat. But no longer. But changing this area here, it lets any mob with "has_hands = TRUE" use the objects they should be allowed to..

* simple_mob Revolution

Allows simple mobs to interact with nanoUI if they have "have_hands = TRUE".

* Revert "Machines can't be used by clowns."

This reverts commit 3cb16f57c0986e492c8f247598fc74773cebea63.

* Moves patch.

Moves Patch to default_vr.dm

* Adds missing part to machinery fix.

Fixes my dummy mistake and effectively unreverts the original commit.
 2020-06-16 00:51:02 -04:00
Aronai Sieyes
2b1b269cb4 Merge pull request #8290 from SweetBlueSylveon/gutter-patch-4 
Gutter patch 4
 2020-06-16 00:47:55 -04:00
Aronai Sieyes
0c3a938347 Merge pull request #8292 from ShadowLarkens/nanoui_update_script 
Replaced broken live update script with python version that works
 2020-06-16 00:47:48 -04:00
Aronai Sieyes
2798866f20 Merge pull request #8267 from SweetBlueSylveon/Pips-mess-of-clowns 
Pips mess of clowns
 2020-06-16 00:47:16 -04:00
Aronai Sieyes
dd662a2965 Merge pull request #8288 from KillianKirilenko/kk-misc 
[LOADOUT] Alt. Paramedic Jacket + Paramedic Vest
 2020-06-16 00:45:24 -04:00
Aronai Sieyes
9da6cfdb2e Merge pull request #8291 from VOREStation/Arokha/logsupply 
Log all supply purchases for stats generation
 2020-06-16 00:44:40 -04:00
SweetBlueSylveon
a0d8ffc913 No more active edges but the airlock buttons aren't gone. 2020-06-15 21:36:17 -07:00
SweetBlueSylveon
297f2dfdaf Revert "No more active edges." 
This reverts commit 61f7db6b37.
 2020-06-15 21:32:58 -07:00
SweetBlueSylveon
61f7db6b37 No more active edges. 2020-06-15 21:31:01 -07:00
ShadowLarkens
eb1d5a997c Replaced broken live update script with python version that works 2020-06-15 21:23:16 -07:00
Arokha Sieyes
862aef7e41 Log all supply purchases for stats generation 2020-06-16 00:19:57 -04:00
SweetBlueSylveon
821520cc3d DMM2TGM 2020-06-15 21:05:55 -07:00
SweetBlueSylveon
246991090f Lotsa stuff! 
Fixes Atmos running out of air midgame by fixing the atmos room!
Fixes the airlock cyclers to actually work.
Fixes docks so that the button for the airlocks can be used when docking.
Adds a couple new areas.
Adds rocky outcroppings.
Added reinforced windows along all window walls.
 2020-06-15 21:03:18 -07:00
Killian
24ef73ca38 Update loadout_suit_vr.dm 2020-06-15 21:41:07 +01:00