cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,630 Commits 9 Branches 0 Tags
d6a20ce66428a41e6249ecc51a3be1c9c70ff43b
Commit Graph

329 Commits

Author SHA1 Message Date
Fluff
d6a20ce664 Mouse Army Works 
The icons for the mouse army tiny mice is some weird jank code that clearly doesn't work.
I just added the normal way of the sprites working.
 2023-03-01 23:13:08 -05:00
Seris02
f95ae5a000 why do I do this to myself 2023-03-01 10:52:27 +08:00
Seris02
fba91c6afd stops proteans from selecting promethean 2023-03-01 09:17:04 +08:00
Razgriz
84ab7c421d Merge pull request #4176 from BlackMajor/protean-rework 
Protean rework part 2 (WIP)
 2023-02-27 19:09:14 -07:00
Razgriz
34cffc0887 Merge pull request #5774 from Kazzc/MoreSuperPoseShelters 
Additional SuperPose Maps and fixes.
 2023-02-26 00:54:59 -07:00
Razgriz
108bbb1e52 Merge pull request #5771 from Seris02/extrastuff 
synthnaga tail, four ears ears, updated digi guilmon markings
 2023-02-25 22:25:28 -07:00
Fluff
90eccca7a2 More Xenomoprhs from Mexcio 
A new variety of Xenomoprhs.
All of them made by Kassc.
They had a map of var edited xenomorphs.
I officially coded them in.
 2023-02-24 19:24:04 -05:00
Kassc
5403f039f7 Additional SuperPose Maps and fixes. 
*LargeAlienShip-57x25
-Should spawn properly now.
-Food vending machines nerfed.
-Various item nerfs.
*TradingShip-40x22
-Food vending machines nerfed.
-Various item nerfs. (removed combat pod. Oof)
*Thanks for SlaysInDutch#4302 we now have more pods!
BrodcastingPod-11x9
DemonPoolV2-43x28
PirateShip-13x30
SurvivalHomeV2-9x9
SurvivalMechFab-9x9
SurvivalMethLab-9x10
SurvivalScience2-9x9
SurvivalSecurity2-9x9
HillOutpost-15x11
 2023-02-23 17:25:49 -05:00
Seris02
9ec91ba026 moar stuff - synthnaga tail, four ears ears, updated digi guilmon markings 2023-02-23 11:44:43 +08:00
BlackMajor
7f52a2318b Merge pull request #5727 from Seris02/radiohelping 
stops radios from dropping out every second message
 2023-02-23 14:42:15 +13:00
BlackMajor
382d8694f0 Merge pull request #5738 from Seris02/digiunbad 
makes tails/wings show underneath bodyparts (makes more difference on digitigrades)
 2023-02-23 14:41:50 +13:00
BlackMajor
2cf320e897 Merge branch 'master' into protean-rework 2023-02-23 14:31:09 +13:00
Nadyr
27658df697 Merge branch 'master' into OvermapDynamicPOIs 2023-02-21 20:03:22 -05:00
Darlantan
1048eaecd2 Adds comments for mappers 2023-02-21 19:47:54 -05:00
Razgriz
af042bb8b4 Merge pull request #5763 from CHOMPStation2/upstream-merge-14512 
[MIRROR] Expands player tip lists with some new ones. Changes some weights
 2023-02-20 16:49:25 -07:00
Razgriz
c3b2c5bd60 picking and choosing 2023-02-20 16:30:54 -07:00
Razgriz
d83309714e Merge pull request #5761 from Seris02/digishoeblood 
digitigrade shoe blood overlay
 2023-02-20 16:19:54 -07:00
Razgriz
8c236865a4 Merge pull request #5754 from FluffMedic/Rigsuits 
Precursor Rigsuit
 2023-02-20 16:00:39 -07:00
Razgriz
3d3861b03f Merge pull request #5737 from Seris02/gargoyle 
gargoyles
 2023-02-20 15:11:27 -07:00
Seris02
0e27736307 digitigrade shoe blood overlay 2023-02-19 18:02:33 +08:00
Fluff
863a499caf Precursor Rigsuit 
Adds a precursor rigsuit called the Xenotech rig, assuming I did the non-code name changes correctly. It's rather resource intensive but overall worth the research and materials.
 2023-02-18 13:11:37 -05:00
Seris02
a3c97cf926 makes a couple Entered() procs call parent as well - bellies + disposals 2023-02-18 11:47:27 +08:00
BlackMajor
a6491b8d6f Merge pull request #5753 from Seris02/swoopiewhy 
stops swoopies attacking prommies and proteans
 2023-02-18 16:26:50 +13:00
Seris02
c62e242e8e stops swoopies attacking prommies and proteans 2023-02-18 10:33:30 +08:00
Razgriz
ddedbf2a8c Merge pull request #5732 from Sharkmare/master 
Add Coalesce to byond
 2023-02-17 03:32:49 -07:00
Razgriz
3d9a5c3dd9 Merge pull request #5742 from Seris02/resizefixer 
fixes double stepping on laying people
 2023-02-17 03:31:52 -07:00
Razgriz
07e912186d Merge pull request #5740 from FluffMedic/Gygaxes 
Gygaxes Mob Nerf
 2023-02-17 03:31:28 -07:00
Seris02
1fb785ccde fixes double stepping on laying people 2023-02-17 16:03:58 +08:00
Fluff
2881c71330 Fixes AADG 
Double checked the speed, should be fine on normal gygaxes, won't outspeed teshies anymore but are still zoomy. But also gave the AADG meme speed because poor thing needs to keep it.
 2023-02-16 18:32:56 -05:00
Fluff
857d1ab5c7 Gygaxes Mob Nerf 
Tried to nerf the gygax mob's insane freaking speed. They're way too fast, and need curbing. Well, so do player mechas but that is an issue for a more skilled coder or when I have less active projects and more frustration on their stronkness.
 2023-02-16 14:03:19 -05:00
Bib Bob
3c8c3982a8 Makes robust guts pickable by non-customs 2023-02-16 09:21:14 -06:00
Seris02
d4cb44c6a6 better gargoyle 2023-02-16 20:01:37 +08:00
Seris02
f4d900475d normal examine message 2023-02-16 15:05:33 +08:00
Seris02
2954f6d674 update modular_chomp human/update_icons to be correct 2023-02-16 14:27:21 +08:00
Seris02
2cbc17f720 Merge branch 'master' of https://github.com/CHOMPStation2/CHOMPStation2 into gargoyle 2023-02-16 12:16:57 +08:00
Seris02
5fe6b10dcd GARGOYLES 2023-02-16 12:15:04 +08:00
Sharkmare
d3c8fe6775 Tabbing indents 2023-02-15 17:18:30 +01:00
Sharkmare
0dd5640739 Should be fine now? 2023-02-15 14:40:28 +01:00
Sharkmare
765c999d8b Trying to placate dreamchecker 
not sure if syntax was really wrong but
 2023-02-15 14:23:36 +01:00
Sharkmare
34721a55bf Add Coalesce to byond 
Add Coalesce to byond

Now on a branch that didnt randomly explode
 2023-02-15 13:44:28 +01:00
Seris02
e2032cae20 back to other things for the moment 2023-02-15 12:07:50 +08:00
Seris02
1a6c7ae6bb gargoyle part one 2023-02-14 16:10:53 +08:00
Nadyr
c2308a7693 Merge pull request #4811 from Kazzc/DesertTiles 
Desert tiles, walls, cliffs, plants, mobs.
 2023-02-13 18:43:45 -05:00
Razgriz
d470d3fae9 Merge pull request #5715 from Seris02/newthingspls 
adds more markings, ears and tails and changes the way digitigrade markings are handled
 2023-02-13 14:31:57 -07:00
Seris02
9c71bcd5e8 tip for disabling periodic tips 2023-02-13 17:36:18 +08:00
Seris02
8b5c0b7f12 adds more markings and changes the way digitigrade markings are handled 2023-02-13 15:43:24 +08:00
Razgriz
31cfabd3c6 Merge pull request #5700 from CHOMPStation2/upstream-merge-14456 
[MIRROR] Implements periodic tips for (new) players!
 2023-02-12 19:04:32 -07:00
Razgriz
411942db8e Merge pull request #5574 from Cyrelius/items 
Making clothing protect against water like it should.
 2023-02-12 18:54:42 -07:00
Razgriz
4cca7ac935 You made this? I made this. 2023-02-12 18:49:22 -07:00
Cyrelius
81bbe0c33b Update rig.dm 
Adds permeability to modular chomp instead.
 2023-02-11 00:33:36 -08:00