cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,425 Commits 8 Branches 0 Tags
c99e7b51da71c447bf421e3b6b28c4750ec35af9
Commit Graph

29125 Commits

Author SHA1 Message Date
Anewbe
d3f3e48897 Adjusts the values of Sif's weather. 2017-09-28 00:08:37 -05:00
Neerti
d2b3e7344c Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 9/28/2017_stack_asthetics 2017-09-28 01:06:04 -04:00
Neerti
2f173dd16b Adds differing stack sprites 
Ports most of /tg/'s sprites for stacks displaying their contents.  I added some of my own as well to fill in materials that we have but they didn't.
Moves all stack icons to their own dmi.
Reworks fifty_spawners to use paths instead of strings, as it prevents bugs in the long term.
 2017-09-28 01:04:19 -04:00
killer653
3f882d6702 Adds riding crop 2017-09-27 23:27:17 -04:00
Anewbe
a3534ab339 Ports Bay's Vox Scrap armor, moves some clothing files 2017-09-27 20:11:37 -05:00
killer653
18a2ba8ed8 Quick fix to get rid of warnings on compile. 2017-09-27 21:01:48 -04:00
Anewbe
1217c1d23c Merge pull request #3961 from MisterLayne/9/26/2017_CableSurgeryFix 
Fixes cables on FBPs (and probably cyborgs)
 2017-09-27 19:46:29 -05:00
Spades
f1cfb91108 Merge pull request #2200 from VOREStation/Cameron653-patch-1 
Bumps borgs up by one.
 2017-09-27 20:24:49 -04:00
Spades
b23ceee403 Merge pull request #2212 from Yewmi/eldi-fluff 
Adds Eldi's fluff reagent implant
 2017-09-27 20:23:57 -04:00
Spades
bda518fd8b Merge pull request #2207 from Cameron653/BYONDMYLIFE_CLOTHES 
Byondmylife clothes
 2017-09-27 20:23:04 -04:00
Spades
13071d2266 Merge pull request #2194 from Cameron653/PERMA_GURGLES 
Variable gurgle damage.
 2017-09-27 20:22:41 -04:00
Spades
7132a04b02 Merge pull request #2193 from Screemonster/pouncecritters 
Adds nom-on-bump behaviour
 2017-09-27 20:22:21 -04:00
Anewbe
7a13c8136f Finishing touches on gravemarkers 2017-09-27 18:59:26 -05:00
Neerti
853d8e80f1 Merge pull request #3914 from Anewbe/bone_fixer 
Adds the bone clamp, and some alien surgery tools
 2017-09-27 19:06:32 -04:00
Neerti
e0d450c5ea Merge pull request #3948 from Anewbe/flash_shield 
The borg shield now protects them from flashes
 2017-09-27 19:05:58 -04:00
Neerti
ab76e6d612 Merge pull request #3958 from Anewbe/legcuffs 
Changes Legcuff sprites
 2017-09-27 19:05:32 -04:00
Neerti
135c5b9219 Merge pull request #3950 from Anewbe/radiation_glows 
Radiation-Mob Interaction tweaks
 2017-09-27 19:05:09 -04:00
Anewbe
424ca30006 Merge pull request #3960 from MisterLayne/9/26/2017_Synthetic_Syring_Fix 
Synth Syringe Fix
 2017-09-27 17:42:43 -05:00
MisterLayne
c967d4cf6e Fixes cables on FBPs (and probably cyborgs) 2017-09-27 15:56:25 -04:00
Cyantime
c77c81b797 Stops size_steal mode from shrinking the user. 2017-09-27 14:55:08 -04:00
Anewbe
eed312a8fb Merge branch 'master' of https://github.com/PolarisSS13/Polaris into gravestone 
# Conflicts:
#	icons/obj/structures.dmi
 2017-09-27 13:49:56 -05:00
elgeonmb
2df750f869 ur right prismatic 2017-09-27 11:23:30 -07:00
Anewbe
7aa1d4fcef Tweaks the Chameleon Gun's tech levels 2017-09-27 12:25:36 -05:00
Anewbe
73ddd22296 Implanter tweaks 2017-09-27 11:59:59 -05:00
elgeonmb
a17d83fb80 Drone circuit +posibrain lorechanges 
Removes all that mumbo about "you live to serve" and replaces it with a reminder that you're designed to be friendly to human values. I don't really see the trouble with this-- if a new drone or posi wants to be a surly bastard, it can, it's just not getting sleeved in a shiny bipedal body.

Also adds a bunch of indulgent OS names for drone circuits.

(Realtalk this is mostly just me figuring out how PRs work so I can start being something closer to actually productive)
 2017-09-27 02:09:06 -07:00
Anewbe
dcf4a6bfea Adds give-modifier to the debug verb list 2017-09-27 01:16:04 -05:00
Anewbe
47f2854bb7 Makes the scythe a child of fireaxes, adds it to the weed control crate 2017-09-26 22:15:33 -05:00
Anewbe
280f3010f8 Adds grave markers 2017-09-26 21:03:34 -05:00
Anewbe
670ae66772 Merge pull request #3956 from Neerti/9/26/2017_old_farmer_harrison 
Adds Farm PoI
 2017-09-26 19:12:35 -05:00
Anewbe
215c080b1e Merge pull request #3438 from Neerti/5/9/2017_reopening_the_salt_mines 
Adds Recently Cloned Modifier to Cloners
 2017-09-26 19:09:12 -05:00
Anewbe
267f5299d9 Merge pull request #3932 from Cameron653/patch-4 
Allows resting people to get off the ground w/ assistance.
 2017-09-26 17:48:15 -05:00
killer653
8e0f08d43b Forgot this 2017-09-26 18:18:33 -04:00
killer653
833fe7a75f BeyondMyLife: Ne'tra Ky'ram fluff 
https://forum.vore-station.net/viewtopic.php?f=26&t=1117&sid=1451fde8eebda775f37a397f5cd50e79

https://forum.vore-station.net/viewtopic.php?f=26&t=1116&sid=1451fde8eebda775f37a397f5cd50e79

https://forum.vore-station.net/viewtopic.php?f=26&t=1115&sid=1451fde8eebda775f37a397f5cd50e79
 2017-09-26 18:14:40 -04:00
MisterLayne
dde6d7d00a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 9/26/2017_Synthetic_Syring_Fix 2017-09-26 17:30:30 -04:00
MisterLayne
99d68540bc Fixes Glitched Synthetic Syring 2017-09-26 17:12:47 -04:00
Anewbe
c0205b1c78 Merge pull request #3953 from Woodratt/WR_09252017_SyndikatID 
Syndicate ID changes
 2017-09-26 16:03:16 -05:00
Anewbe
b6534b9008 Merge pull request #3949 from Atermonera/AI_langs 
AI can speak station languages
 2017-09-26 15:05:58 -05:00
Verkister
5570540463 Oh hey actual code changes 
-Some general spaghetti merging, fixing, and trimming.
-Guard otie's gut now starts out safe upon bellybrigging.
-Toned down some shitty meme speak.
-You can now trade in donuts in order to retrieve the bellybrigged harmlessly.
-Remember to set them off arrest first tho or you'll be needing some backup donuts :v
 2017-09-26 18:15:07 +03:00
Neerti
dcd2580dc2 Merge pull request #3918 from Anewbe/liver_alcohol 
Adjusts liver damage from alcohol
 2017-09-26 07:01:15 -04:00
Neerti
447ad5de70 Merge pull request #3927 from Anewbe/intercom 
Adds more channels to intercom msg
 2017-09-26 07:00:40 -04:00
Anewbe
a4dd5056b0 Changes Legcuff sprites 2017-09-26 05:48:59 -05:00
Neerti
1076b264aa Merge pull request #3942 from Anewbe/promethean_core 
Moves the Promethean core to the chest. They no longer need heads.
 2017-09-26 03:46:30 -04:00
Neerti
1b22c7e152 Merge pull request #3941 from Anewbe/lung_pressure 
Different species can now have different minimum levels of air
 2017-09-26 03:44:49 -04:00
Anewbe
6d0e6c4b0f Merge pull request #3757 from SpadesNeil/Ace-infuriates-Anewbe-with-another-vintage-weapon 
Adds M1 Garand
 2017-09-26 01:09:46 -05:00
Neerti
6d821a9cfd Adds compromise. 2017-09-26 01:50:02 -04:00
Neerti
aa454c0e1d Adds Farm PoI 
Also fixes various bugs with surface tiles, hopefully.
Adds some documentation to the map file system.
Adds a new 'plane' map, ideal for testing PoIs by loading them manually.
Makes space heaters glow orange.
Adds a new grille type for fancy surface windows.
Adds self planting hydro trays/dirts if a seed is on top of them when the map is loaded.
 2017-09-26 01:44:06 -04:00
Anewbe
7c9813e24a Fixes a runtime 2017-09-25 23:42:25 -05:00
Neerti
7c93f0089c Merge pull request #3944 from Anewbe/spiderbot_fix 
Allows hatted slimes and spiderbots to ventcrawl properly.
 2017-09-25 21:35:54 -04:00
Anewbe
caa4fecd8b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into bone_fixer 
# Conflicts:
#	icons/obj/abductor.dmi
 2017-09-25 20:35:19 -05:00
Neerti
c262cd91c2 Merge pull request #3933 from Anewbe/batteries 
Battery tweaks, self recharge fix
 2017-09-25 21:32:41 -04:00