cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,719 Commits 10 Branches 0 Tags
1456af50f7c755522fa75286ddf630038bb77199
Commit Graph

26490 Commits

Author SHA1 Message Date
izac112
1456af50f7 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-14 00:21:02 +02:00
Novacat
97d63565fd Merge pull request #8390 from Rykka-Stormheart/shep-dev-booze-traits 
Add Booze Traits!
 2020-07-13 15:06:36 -04:00
Killian
70e9c69ff3 pain_mod implementation (#7330) 2020-07-13 12:09:57 -04:00
Rykka
0ae99a1407 Fix Slow Comfortable Screw Against the Wall 
The drink was set to strength = 0 resulting in a multiply by 0 and infinite alcoholism. You'd literally commit alcohol coma and instant liver death on drinking this.
 2020-07-12 12:11:42 -04:00
Rykka
55e9bca231 Add Booze Traits! 
Upstream port of https://github.com/Yawn-Wider/YWPolarisVore/pull/619

Credit goes to @KillianKirilenko for this, I just ported this upstream and put all the traits in neutral.dm as per admin request!

**Description:**
This uses the universal alcohol_mod to allow for increasing/reducing the effects of ethanol based on the trait you've taken. Basically? You can get drunk more or less quickly. This does not change how fast you die when you start taking liver damage/tox, this only affects how fast alcohol makes you drunk.
 2020-07-12 11:57:36 -04:00
Verkister
31b4bc1a6a Fixes vr monkeycube boxes getting extra monkeys 
Fixes sobaka/saru/sparra/wolpin cube boxes spawning with bonus 4 regular monkeycubes
 2020-07-10 11:54:36 +03:00
Novacat
90483ba481 Merge pull request #8362 from KillianKirilenko/kk-balls 
BALL!
 2020-07-09 20:08:21 -04:00
Novacat
5b47aa2cf1 Merge pull request #8378 from VOREStation/upstream-merge-6799 
[MIRROR] New book sprites + inhands
 2020-07-09 20:06:44 -04:00
Novacat
20749a4b63 Merge pull request #8381 from VOREStation/upstream-merge-7326 
[MIRROR] Arrivals Shuttle Message Fix
 2020-07-09 20:06:07 -04:00
Atermonera
a697e83ebd Merge pull request #7326 from Neerti/arrival_announcement_fix 
Arrivals Shuttle Message Fix
 2020-07-09 18:29:38 -04:00
Atermonera
3c16520a60 Merge pull request #7325 from Mechoid/FixTheStunShotsAgain 
Fix runtime in projectile.dm, 664.
 2020-07-09 18:27:21 -04:00
Schnayy
99a977ee3d Merge pull request #6799 from Cerebulon/booksprites 
New book sprites + inhands
 2020-07-09 17:33:58 -04:00
Killian
2006d45647 expand #8372 2020-07-09 05:24:16 +01:00
Novacat
05175e1a4c Merge pull request #8374 from VOREStation/upstream-merge-7321 
[MIRROR] Fix Adv. Suit Belt
 2020-07-08 22:29:59 -04:00
Killian
56503a9a67 Update robotics.dm (#7321) 2020-07-08 21:22:57 -04:00
Killian
6b6f561f33 Streamlined Voidsuits Upgrade (#7300) 
* veymed voidsuits upgrade

* unathi streamlined suit polish

* link to #7301

removes the specific checks from SSU.dm and adds no_cycle

* teshari subtype
 2020-07-08 21:21:29 -04:00
SplinterGP
46fc66e0ff Merge branch 'master' into holdelta 2020-07-08 02:00:45 -03:00
Repede
1845eed3cc Fixes some events, removes unused scripts related to TGS3, etc 2020-07-07 20:04:03 -04:00
SplinterGP
7d61e24dd3 actually fixes cooper, ack 2020-07-07 13:52:46 -03:00
Leshana
c59cb0cda4 Fix indentation syntax error. (#7320) 
Bad extra indent causes compile failures on strict DM compilers.  Breaks linting.
 2020-07-07 02:42:31 -04:00
SplinterGP
b3721ab15d Merge remote-tracking branch 'Yawn-wider/master' into holdelta 2020-07-06 21:12:45 -03:00
SplinterGP
c7942a1d86 FIXES COOPER!!!!!!!1111!!1!!11!!!! 2020-07-06 21:12:25 -03:00
Repede
270831bf92 Merge branch 'master' into xionalt 2020-07-06 19:23:15 -04:00
Repede
baaf131730 Alt pattern for the xion outfit: named xion (yw alt) - Spritefix by whiteout 2020-07-06 19:22:22 -04:00
SplinterGP
d01a0d207a Merge remote-tracking branch 'Yawn-wider/master' into holdelta 2020-07-06 17:25:42 -03:00
SplinterGP
a056658ef6 Tesh fluffies 2020-07-06 16:58:15 -03:00
Novacat
0b9562a5e7 Merge pull request #8357 from VOREStation/upstream-merge-7315 
[MIRROR] Add clickable action buttons from /TG/, rework a lot of backend and other improvements.
 2020-07-06 10:57:22 -04:00
izac112
01a20369ee Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore into izac 2020-07-06 15:39:21 +02:00
izac112
d9af2a4cca updates client procs.dm 2020-07-06 15:38:55 +02:00
Novacat
396b64e1c0 Merge pull request #8364 from VOREStation/upstream-merge-7307 
[MIRROR] Makes mob/obj/turf spawn windows pop up in proper size
 2020-07-06 07:32:11 -04:00
Novacat
9fee4f4c7b Merge pull request #8367 from KillianKirilenko/kk-fixes 
Update robolimbs_vr.dm
 2020-07-06 07:31:53 -04:00
Killian
89b1cc659f Update robolimbs_vr.dm 2020-07-06 08:47:42 +01:00
Izac Joof Forsgren
2214949d79 Merge branch 'master' into izac 2020-07-05 22:38:39 +02:00
Novacat
a82c815a4f Update create_object.dm 2020-07-05 15:20:08 -04:00
Atermonera
14484a2d83 Makes mob/obj/turf spawn windows pop up in proper size 2020-07-05 14:04:25 -04:00
lukevale
8bebad0ead Jean's chocolate box 
Time for her to money shot with dat girl scout chocolates
 2020-07-05 09:22:21 -05:00
lukevale
4c9cd195e4 Adds in cyber dragon wings. 2020-07-05 02:40:55 -05:00
izac112
4b55c8b507 Preparations for tgs 4 (does not actually change anything for current tgs version) 2020-07-04 23:37:42 +02:00
Killian
68e0f2fd23 BALL! 2020-07-04 17:51:39 +01:00
Novacat
384c22f510 Update mob_defines.dm 2020-07-04 08:58:10 -04:00
Novacat
32eb36ba25 Update mob_defines.dm 2020-07-04 08:57:04 -04:00
SplinterGP
28b5e2b143 tesh markings 2020-07-04 02:19:25 -03:00
Layne
989ca48282 ice cream 2020-07-04 00:37:03 -04:00
Kates
e62938bc61 Add clickable action buttons from /TG/, rework a lot of backend and other improvements. 2020-07-03 18:29:29 -04:00
Novacat
33e07ac92d Merge pull request #8091 from Cameron653/transparency_v2 
Adds the ability for prometheans to toggle transparency.
 2020-07-03 17:49:45 -04:00
C.L
13844c6ece Added clarification to kick travis into working. 2020-07-03 17:38:40 -04:00
Repede
13b7aeb4a5 https://github.com/CHOMPStation2/CHOMPStation2/pull/207 2020-07-03 16:56:42 -04:00
Repede
a9993021f7 Merge branch 'master' into lumber 2020-07-02 23:54:44 -04:00
Repede
6a38c309af Makes wood logs worth points (lumbering time) 2020-07-02 23:54:09 -04:00
Repede
c6e5eac570 adds missing comment 2020-07-02 23:17:51 -04:00