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
56,720 Commits 7 Branches 0 Tags
c9ba7202bc44d0e92d9ade71858b0936ef512911
Commit Graph

26491 Commits

Author SHA1 Message Date
KasparoVy
a878782e93 Adds Shipping Value to Plastitanium 
8/8
 2020-06-19 02:38:24 -04:00
Killian
0bb0f8bc71 Merge remote-tracking branch 'upstream/master' into kk-suits 2020-06-19 06:28:41 +01:00
Killian
2ca5f52033 rebase hos suit 2020-06-19 06:28:33 +01:00
Killian
039928ab72 ert suits and cleanup 2020-06-19 04:35:30 +01:00
Verkister
13a0881fcf Adds those mobs in the code after all 
I'm fucking unstoppable tonight gonna crash soon hnn
 2020-06-19 01:33:41 +03:00
Killian
4af04c4df7 fix #8227 and #8306 2020-06-18 07:48:03 +01: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
izac112
c0fd0e0a45 comment out 2020-06-17 08:50:07 +02:00
izac112
ff9f2b40a6 need to commit to test 2020-06-17 08:19:21 +02:00
izac112
65e4bd22d4 thing.egg 2020-06-17 07:36:15 +02:00
izac112
27f8bebd7b temp1 2020-06-17 07:32:53 +02:00
izac112
bfe139f95f temp 2020-06-17 07:28:54 +02:00
izac112
cf3238b0e2 new commands first draft 2020-06-17 06:20:18 +02:00
izac112
dd22d0093c fixes 2020-06-17 04:36:50 +02:00
izac112
4864ad384d Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-17 04:30:06 +02: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
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
Atermonera
c95c01705a Merge pull request #7289 from Cyantime/patch-2 
Give rock turfs radiation blocking capabilities.
 2020-06-16 03:34:38 -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
Atermonera
678f441458 Merge pull request #7285 from BlackMajor/patch-1 
Fixes a crash exploit.
 2020-06-16 03:31:56 -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
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
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
2798866f20 Merge pull request #8267 from SweetBlueSylveon/Pips-mess-of-clowns 
Pips mess of clowns
 2020-06-16 00:47:16 -04:00
Killian
24ef73ca38 Update loadout_suit_vr.dm 2020-06-15 21:41:07 +01:00
Killian
37a2a052d9 Update loadout_suit_vr.dm 2020-06-15 21:28:54 +01:00
SweetBlueSylveon
2105198db8 Cuts down on code. 
Cuts down on code by removing a large chunk of redundant lines wrieeten for every mob.
 2020-06-15 12:03:01 -07:00
Aronai Sieyes
652a0c5b1c Merge pull request #8284 from Novacat/nova-basicfixes 
Reduces Default (and mob) digestion rate
 2020-06-15 11:37:09 -04:00
Aronai Sieyes
1de402fce9 Merge pull request #8255 from KillianKirilenko/kk-traffic2 
Killian's Improved Traffic System, Take Two
 2020-06-15 11:36:35 -04:00
Aronai Sieyes
08c32e9bd1 Merge pull request #8257 from lm40/master 
Adds medical graviton eyepatch
 2020-06-15 11:33:30 -04:00
Aronai Sieyes
9c588ab41c Merge pull request #8282 from KasparoVy/sharpest-edgiest-rogue 
Adds Creation of Whetstones from Durasteel & Plastitanium
 2020-06-15 11:30:03 -04:00
Aronai Sieyes
2bed004132 Merge pull request #8283 from knoxon1/zenasuit 
Adds Zena's Shroud Suit Fluff Item
 2020-06-15 11:29:54 -04:00
Unknown
1b8409beda Reduces Default (and mob) digestion rate 
from 2/2 to 0.5/0.5

Due to a discussion in exploration, and the preferences stated by a headmin.
 2020-06-15 01:20:51 -04:00
knoxon1
2f15905e6e aaa 2020-06-14 22:55:02 -05:00
KasparoVy
215792e703 Adds Creation of Whetstones from Durasteel & Plastitanium 
Can currently be done with plasteel and titanium.
 2020-06-14 23:13:42 -04:00
Atermonera
bcd18e4997 Merge pull request #7278 from VOREStation/vplk-unused-image-assets 
Remove Unused Image Assets
 2020-06-14 21:32:34 -04:00
Novacat
4e889046e9 Merge pull request #8274 from Novacat/nova-basicfixes 
Vox Phoron and Adminbus Backpacks
 2020-06-14 15:48:40 -04:00
Novacat
6c899ae143 Merge pull request #8276 from VOREStation/Verkister-patch-2 
Earlyports prommie passive gain fix
 2020-06-14 15:47:47 -04:00
Novacat
71358c42c8 Merge pull request #8269 from VOREStation/upstream-merge-7290 
[MIRROR] mining drill and recharger find their shiny new cells
 2020-06-14 15:37:20 -04:00
Unknown
ff0716f501 Last minute fixes 2020-06-14 15:34:47 -04:00