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
39,425 Commits 9 Branches 0 Tags
c99e7b51da71c447bf421e3b6b28c4750ec35af9
Commit Graph

29125 Commits

Author SHA1 Message Date
Anewbe
b3fdf3836e Adds a frost spider nest PoI, adds frost spider things 2017-09-29 22:01:41 -05:00
Anewbe
eada60d41f Adds giant crabs 2017-09-29 19:54:27 -05:00
Cameron653
c46c397280 Fixes Beyondmylife's coat 2017-09-29 20:52:08 -04:00
Verkister
02c5c25d8c Mice. 
-Brings back the cat mouse targeting. The earlier removal had made the pups a bit too passive around them.
 2017-09-30 02:22:36 +03:00
Verkister
6d814dd632 Mice are the anti-donut now. 
-A guardpup belly mode safetied by a successful crime catch now turns back to unsafe upon eating a mouse.
-Not hacky or anything haha. Just intentional scatterbrain shit of a yummier prey making the klutzpups forget about their prisoner transportation duty :v
 2017-09-30 02:16:32 +03:00
Cameron653
236e7812e3 Reenables solar grub events 2017-09-29 18:52:01 -04:00
Neerti
34f5b7b6bf Merge pull request #3970 from Anewbe/vox_scrap 
Ports Bay's Vox Scrap armor, moves some clothing files
 2017-09-29 18:40:59 -04:00
Spades
c340692492 Merge pull request #2206 from MechaFrogg/master 
Added Frog Taurs
 2017-09-29 18:14:34 -04:00
Spades
7991dfcc47 Merge pull request #2215 from Cameron653/RIDING_CROP 
Adds riding crop
 2017-09-29 18:14:24 -04:00
Spades
cfb1d39b95 Merge pull request #2216 from Ketrai/patch-3 
Allows nom on bumb behavoir for solargrubs
 2017-09-29 18:14:16 -04:00
Spades
dfd7e024a1 Merge pull request #2222 from Cyantime/bombzone 
Adds a plasma research outpost.
 2017-09-29 18:13:10 -04:00
Spades
57398cdaf1 Merge pull request #2218 from Pawoverlord/pawoverlord_fluffitem 
Update custom_permits_vr.dm
 2017-09-29 18:12:42 -04:00
Anewbe
73ca1f1803 Less meat from Clonex+Blood 2017-09-29 16:48:02 -05:00
Neerti
b31df8b4ae Merge pull request #3978 from Cyantime/pipemeter 
Pipe meter tweaks
 2017-09-29 17:28:10 -04:00
Neerti
d7a6c93b23 Merge pull request #3972 from Anewbe/temperate_sif 
Adjusts the values of Sif's weather.
 2017-09-29 17:26:59 -04:00
Anewbe
a5acb5d1bb Merge pull request #3971 from Neerti/9/28/2017_stack_asthetics 
Adds differing stack sprites
 2017-09-29 16:07:04 -05:00
Anewbe
22c91faa86 Merge pull request #3976 from MisterLayne/9/28/17_DeactivateGuestPass 
Makes guest passes great again!
 2017-09-29 16:01:11 -05:00
Anewbe
08b872343b Merge pull request #3974 from Neerti/9/27/2017_more_shields 
Adds Directional Shields
 2017-09-29 15:56:08 -05:00
Neerti
4c2fd72c5f Merge pull request #3977 from Cyantime/trinary 
Fixes some trinary device direction initializations
 2017-09-29 15:45:59 -04:00
Anewbe
969aa45e9a Switches 2 for DEAD 2017-09-29 12:07:16 -05:00
Neerti
cdb2a85538 Merge pull request #3963 from Anewbe/scythe 
Makes the scythe a child of fireaxes, adds it to the weed control crate
 2017-09-29 09:53:18 -04:00
Cyantime
9b154516a0 Needs this too. 2017-09-29 02:38:54 -04:00
Cyantime
36e78b48f1 Adds plasma research outpost. 2017-09-29 02:28:43 -04:00
Anewbe
efa89a9650 Splits the robot_modules file. Continues work on gravekeeper drone. 2017-09-29 01:02:53 -05:00
Cyantime
96190e94aa Allows emitters to blast through rocks again. 2017-09-29 01:05:40 -04:00
Anewbe
20c5e31c3b Adds the gravekeeper lost borg module 2017-09-28 22:21:09 -05:00
Anewbe
3e18ec7a47 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vox_scrap 
# Conflicts:
#	icons/obj/clothing/suits.dmi
 2017-09-28 20:55:37 -05:00
Anewbe
7c5d7c4d75 Improves tracking implant code, adds a tracking implant variant to the loadout 2017-09-28 20:25:46 -05:00
MisterLayne
c47cc200d5 Makes guest passes great again! 2017-09-28 19:43:57 -04:00
Pawoverlord
45389c5ea5 Update custom_permits_vr.dm 
Added Sorrel Cavalet to the list of permits.
 2017-09-28 19:43:09 -04:00
Cyantime
4ba5c28eca Pipe meter examine update. 2017-09-28 19:29:56 -04:00
Cyantime
b118476da8 Pipe meter tweaks 2017-09-28 19:25:35 -04:00
Cyantime
56afe20d39 Fixes some trinary device direction initializations 2017-09-28 17:39:46 -04:00
Anewbe
9f651ba5f2 Adds a no_clone modifier 2017-09-28 16:26:24 -05:00
Anewbe
dffb3a6fef Merge branch 'master' of https://github.com/PolarisSS13/Polaris into scythe 
# Conflicts:
#	icons/obj/weapons.dmi
 2017-09-28 16:07:45 -05:00
Anewbe
ef1749009a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into implanter_fix 
# Conflicts:
#	icons/obj/items.dmi
 2017-09-28 15:56:53 -05:00
Anewbe
a030390c4e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into drone_circuits 
# Conflicts:
#	code/modules/mob/living/carbon/brain/MMI.dm
 2017-09-28 15:38:19 -05:00
Neerti
ea138e0cec Merge pull request #3968 from Anewbe/cham_gun 
Tweaks the Chameleon Gun's tech levels
 2017-09-28 16:25:02 -04:00
Neerti
d4dd908f94 Merge pull request #3962 from Anewbe/gravestone 
Adds grave markers
 2017-09-28 16:22:46 -04:00
Neerti
5cd490f7b2 Merge pull request #3940 from Anewbe/technomancer_armor 
Improves the tesla and shield generator armors
 2017-09-28 16:22:18 -04:00
Neerti
0ad7eee12a Adds automatic shield projector for simple animals 2017-09-28 15:05:14 -04:00
Neerti
fe32372f74 Adds Directional Shields 
Implements shields which block projectiles from outside, but allow projectiles to leave from inside.
Also adds a projector item which makes these, in two variants, rectangle and line.  It was made an item so that down the road making stationary/wearable/etc versions will be easier as they can just contain the item.
Currently there is no way to obtain this without adminspawn.  I have Future Plans(tm) for these.
 2017-09-28 14:06:07 -04:00
Anewbe
6559299591 Merge pull request #3966 from elgeonmb/elgeonmb-brainlore 
Drone circuit + posibrain lorechanges
 2017-09-28 11:09:35 -05:00
Ketrai
4e18420052 amazing 2017-09-28 15:06:03 +02:00
Ketrai
46a0c4efde fixes format 2017-09-28 14:25:51 +02:00
Anewbe
958bbec60d Splits cold/heat processing into breath and body vars, species temp tweaks 2017-09-28 01:58:50 -05:00
Ketrai
80b47f02b4 scro it, makes them pushover-like. 
shouldn't be any threat now.
 2017-09-28 08:24:39 +02:00
Ketrai
d7a2ba8883 makes grubs less beefy. 
This combined with the fix of the poison should make engineers, slimes, organics and synths alike more than capable of dealing with them using as much as a crowbar.
 2017-09-28 08:16:40 +02:00
Verkister
b0199bb80e Merge branch 'master' of https://github.com/VOREStation/VOREStation into returnofthelongpup 
# Conflicts:
#	icons/vore/custom_clothes_vr.dmi
 2017-09-28 08:50:38 +03:00
Ketrai
7ec99a0d26 Allows nom on bumb behavoir for solargrubs 
Went with the proposed 50% to try and eat people if you bump into them.
 2017-09-28 07:23:27 +02:00