cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-11 01:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,818 Commits 7 Branches 0 Tags
89b05ca18b95e6cdfe01e41bfbccf69fdd791cd9
Commit Graph

50479 Commits

Author SHA1 Message Date
Rykka Stormheart
89b05ca18b Fixes Explosions runtiming 
Explosions will no longer try to play the deaf_loop on ghosts and then cause a runtime.
 2023-03-10 03:47:03 -08:00
Nadyr
f09fd02e6e Merge pull request #5894 from CHOMPStation2/upstream-merge-14641 
[MIRROR] Fixes some admin perms not being properly checked
 2023-03-09 22:23:21 -05:00
Nadyr
0cb04f7a19 Merge pull request #5890 from CHOMPStation2/upstream-merge-14519 
[MIRROR] [MIRROR] allows animations to be toggled in preferences
 2023-03-09 22:18:05 -05:00
Nadyr
deb7221578 Merge pull request #5889 from CHOMPStation2/upstream-merge-14630 
[MIRROR] NIF damage minitweak
 2023-03-09 22:17:24 -05:00
Nadyr
2eb94dcbaf Merge pull request #5887 from CHOMPStation2/upstream-merge-14607 
[MIRROR] [MIRROR] Fixes an oversight with default emote retrieval.
 2023-03-09 22:13:51 -05:00
Nadyr
9968742281 Merge pull request #5886 from CHOMPStation2/upstream-merge-14610 
[MIRROR] [MIRROR] Projectiles properly set starting var.
 2023-03-09 22:09:14 -05:00
Nadyr
4d61bf0f16 Merge pull request #5884 from CHOMPStation2/upstream-merge-14584 
[MIRROR] stops robots from getting spammed on different z levels from cellcharge anomaly
 2023-03-09 21:25:11 -05:00
Nadyr
8e87297f90 Merge pull request #5883 from CHOMPStation2/upstream-merge-14583 
[MIRROR] more fixed admin hrefs
 2023-03-09 21:23:50 -05:00
Nadyr
3fa558ba82 Merge pull request #5879 from CHOMPStation2/upstream-merge-14628 
[MIRROR] Adds a Single Side Horn and Blade-Like Tail markings
 2023-03-09 21:20:34 -05:00
Nadyr
3b73100ae8 Merge pull request #5878 from CHOMPStation2/upstream-merge-14629 
[MIRROR] Adds 'vore' objective
 2023-03-09 21:19:43 -05:00
Nadyr
a3576a6f06 Merge pull request #5876 from CHOMPStation2/upstream-merge-14620 
[MIRROR] Start With Backup Implant setting
 2023-03-09 21:19:11 -05:00
Nadyr
2eb9bc33f3 powder that makes you say yes 2023-03-09 21:00:47 -05:00
Nadyr
98feff2977 powder that makes you say yes 2023-03-09 20:59:23 -05:00
Nadyr
b5bfb71f76 Merge pull request #5877 from CHOMPStation2/upstream-merge-14619 
[MIRROR] Updates player tips subsystemwith a new tip about maint preds.
 2023-03-09 20:58:09 -05:00
Nadyr
563e79da67 powder that makes you say yes 2023-03-09 20:57:04 -05:00
Nadyr
3cd859e7e9 Merge pull request #5875 from CHOMPStation2/upstream-merge-14591 
[MIRROR] Adds new POI to RP, creates scug spawner object
 2023-03-09 20:55:20 -05:00
Nadyr
809f95e4b5 Merge pull request #5874 from CHOMPStation2/upstream-merge-14617 
[MIRROR] Allows the crafting of Eris-style floors
 2023-03-09 20:51:18 -05:00
Nadyr
bde3f21b52 Merge pull request #5872 from Sharkmare/Gargoyle-abstraction 
Gargoyle Custimization round 1
 2023-03-09 20:48:55 -05:00
Nadyr
306a6d9415 Merge pull request #5867 from Aroliacue/Aroliacue_Hive 
Adds TG Dragon Wings + new chomp_modular folder
 2023-03-09 20:42:30 -05:00
Nadyr
9ecf4c53ca Merge pull request #5870 from Sharkmare/patch-13 
Fixing a Unit test runtime on siffet
 2023-03-09 20:41:08 -05:00
Nadyr
3191dc8bd9 Merge pull request #5866 from tacoguy7765093/saltyandsweet 
Removed my bloat chem, replaces with inefficient glucose recipe
 2023-03-09 20:40:14 -05:00
Nadyr
2028a64669 Merge pull request #5865 from CHOMPStation2/upstream-merge-14592 
[MIRROR] Hopefully fixes stuck typing indicators when changing bubble mid-typing
 2023-03-09 20:38:52 -05:00
Nadyr
2143e762cf Merge pull request #5863 from Sharkmare/Advanced-voidsuit-no-more 
Replaces "advanced voidsuit" with hardsuit
 2023-03-09 20:37:46 -05:00
Nadyr
7baa5027ef Merge pull request #5857 from RinPin/master 
Adds green fox plushie!
 2023-03-09 20:37:03 -05:00
Nadyr
151fe34ba6 Merge pull request #5860 from Seris02/sockdigi 
digitigrade socks
 2023-03-09 20:36:17 -05:00
Nadyr
c53521a696 Merge pull request #5858 from Verkister/itemblorpies 
Adds item digestion noises.
 2023-03-09 20:35:37 -05:00
Casey
96a7facbb6 Merge pull request #14641 from Heroman3003/admin-perm-fixes-also-sound 
Fixes some admin perms not being properly checked
 2023-03-09 21:05:11 +00:00
Heroman3003
0af4214f61 Merge pull request #14519 from VOREStation/upstream-merge-8944 
[MIRROR] allows animations to be toggled in preferences
 2023-03-09 05:22:26 +00:00
Heroman3003
0a49c21182 Merge pull request #14630 from KillianKirilenko/kk-mini2 
NIF damage minitweak
 2023-03-09 05:22:21 +00:00
Heroman3003
b83f351431 Merge pull request #14607 from VOREStation/upstream-merge-8988 
[MIRROR] Fixes an oversight with default emote retrieval.
 2023-03-09 05:17:02 +00:00
Heroman3003
a4a7079374 Merge pull request #14610 from VOREStation/upstream-merge-8997 
[MIRROR] Projectiles properly set starting var.
 2023-03-09 05:16:57 +00:00
Heroman3003
ccc5bb3afe Merge pull request #14584 from Seris02/anomalyfix 
stops robots from getting spammed on different z levels from cellcharge anomaly
 2023-03-09 05:10:36 +00:00
Heroman3003
4fff3b4226 Merge pull request #14583 from Seris02/adminjumplink 
more fixed admin hrefs
 2023-03-09 05:08:26 +00:00
Heroman3003
68c300e087 Adds a Single Side Horn and Blade-Like Tail markings 2023-03-08 21:51:50 +00:00
Casey
f22503b5a2 Adds 'vore' objective 2023-03-08 21:47:38 +00:00
Casey
21e5e9f896 Merge pull request #14619 from Runa-Dacino/playertipsexpansion 
Updates player tips subsystemwith a new tip about maint preds.
 2023-03-08 19:09:54 +00:00
Casey
33b59118ef Start With Backup Implant setting 2023-03-08 19:09:49 +00:00
Casey
4273cca010 Merge pull request #14591 from Runa-Dacino/scugpicnic 
Adds new POI to RP, creates scug spawner object
 2023-03-08 19:07:40 +00:00
Casey
7b62bb9d2a Merge pull request #14617 from TheToaster98/ErisFloors 
Allows the crafting of Eris-style floors
 2023-03-08 19:07:31 +00:00
Sharkmare
4a2b06e0cf Gargoyle Custimization round 1 
"statue of name" now allows to change the statue part
"your skin hardens" now allows to change the hardens part
"you  turn to stone" now allows to change the stone part

"your skin softens" modified to "your skin reverts" so we dont need a negative adjective
 2023-03-08 17:38:36 +01:00
Sharkmare
3eede165cc Fixing a Unit test runtime on siffet 
IIsAlly according to unit test logs can be called on on living creatures such as structures.
therefore if siffet is close to structures we runtime as structure have no mob_size

This should solve this runtime

Relevant Runtime info:
[2023-03-08T10:19:27] Runtime in siffet.dm,61: undefined variable /obj/machinery/porta_turret/poi/var/mob_size
  proc name: IIsAlly (/mob/living/simple_mob/animal/sif/siffet/IIsAlly)
  src: the siffet (/mob/living/simple_mob/animal/sif/siffet)
  src.loc: the dirt (189,191,9) (/turf/simulated/floor/outdoors/dirt)
  call stack:
  the siffet (/mob/living/simple_mob/animal/sif/siffet): IIsAlly(the turret (/obj/machinery/porta_turret/poi))
 2023-03-08 13:00:25 +01:00
Aroliacue
34b8c3ac29 Adds TG Dragon Wings 2023-03-08 17:15:26 +10:00
Bib Bob
2ebf2e6306 removed chem bloat 2023-03-07 22:15:21 -06:00
Heroman3003
b4741c1668 Merge pull request #14592 from Heroman3003/indicator-hopefully-fix 
Hopefully fixes stuck typing indicators when changing bubble mid-typing
 2023-03-08 02:07:44 +00:00
Sharkmare
df157ddea4 Replaces "advanced voidsuit" with hardsuit 
The CEs rig seems to be the only leftover remnant of a RIG being incorrectly described as a voidsuit.
Its mechanized, outperforms other rigs such as EVA and especially NULL and has no reason not to be called a hardsuit
 2023-03-07 18:06:19 +01:00
Seris02
4c629936f7 fixes a few belly bugs and improves belly color selection 2023-03-07 11:14:06 +08:00
Seris02
4d2fd463ae digitigrade socks 2023-03-07 10:08:38 +08:00
Nadyr
71a2ad8d9c Merge pull request #5795 from CHOMPStation2/upstream-merge-14548 
[MIRROR] Character Setup Lore Option Tweaks
 2023-03-06 15:59:50 -05:00
Nadyr
9953234d79 Merge pull request #5855 from CHOMPStation2/upstream-merge-14614 
[MIRROR] Adds new unathi horns and new unathi head shape (as a marking)
 2023-03-06 13:44:45 -05:00
Nadyr
abef271360 powder that makes you say yes 2023-03-06 13:29:45 -05:00