cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,019 Commits 5 Branches 0 Tags
cf263e348e7cc1f1c977e902fca87ded97980500
Commit Graph

26199 Commits

Author SHA1 Message Date
Neerti
cf263e348e Merge pull request #3981 from Anewbe/gravetender 
Adds the gravekeeper lost borg module
 2017-10-03 23:01:15 -04:00
Neerti
fe9822362c Merge pull request #3979 from Anewbe/tracking_implant 
Improves tracking implant code, adds a tracking implant variant to the loadout
 2017-10-03 22:58:10 -04:00
Neerti
ca7de7e98b Merge pull request #3973 from Anewbe/breath_temp 
Splits cold/heat processing into breath and body vars, species temp tweaks
 2017-10-03 22:57:56 -04:00
Anewbe
46994b378d Adds a null check for not having a backpack 2017-10-03 16:16:35 -05:00
Neerti
c431d983fb Merge pull request #4003 from Anewbe/boots_of_speed 
Makes the boots of speed slower, and boots.
 2017-10-03 00:40:48 -04:00
elgeonmb
e5474c2dc1 Food fluff (#4008) 
* food fluff

* Update polaris.dme

* what the hell is Jargon 4

* screeching

* somehow that last one broke something

* how can I not spell vacuum
 2017-10-02 19:59:00 -05:00
Anewbe
860c1d2e9f Makes the auto-antag-record logging for loadout items prettier 2017-10-02 03:08:01 -05:00
Anewbe
5e635aff46 Adds a hacky method to put loadout implants in the user's antag records. Fixes a runtime. 2017-10-02 00:11:27 -05:00
Anewbe
46e411f80f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into tracking_implant 2017-10-01 21:52:36 -05:00
Anewbe
90776f4051 Merge pull request #4009 from elgeonmb/skrelltalk 
Strips special characters from Skrellian syllable list
 2017-10-01 21:23:49 -05:00
elgeonmb
77aadf1d4a strips special characters from Skrellian 2017-10-01 19:12:44 -07:00
ElectricB1ue
e67df48111 Changes the leg holster item sprite. (#3994) 
* Add files via upload

* Changes the item sprite
 2017-10-01 20:19:43 -05:00
elgeonmb
9acc8a5d2c Cigarette Grammar + Lorefixes (#3999) 
* Cigarette Grammar + Lorefixes

The grammar in the original was a little wonky and we all know how I feel about wonky grammar. Also made Jerichos a SAARE thing since Heph doesn't really _use_ their guns and brought fashionable menswear to the masses.

* woops made an error as I was trying not to make an error

* forgot menthols
 2017-10-01 13:59:21 -05:00
Neerti
51e980ebdc Merge pull request #3984 from Anewbe/less_meat 
Less meat from Clonex+Blood
 2017-10-01 14:48:42 -04:00
Neerti
16f6e21e17 Merge pull request #3964 from Anewbe/cloning_sickness 
Renames the cloning modifier, minor grammatical fixes
 2017-10-01 14:48:11 -04:00
Anewbe
e82ea2d599 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into implanter_fix 
# Conflicts:
#	icons/obj/items.dmi
 2017-10-01 13:13:13 -05:00
Anewbe
5d819ade53 Fixes the entire cloning_sickness PR 2017-10-01 12:50:06 -05:00
Neerti
23b0312af9 Merge pull request #3975 from Anewbe/no_clone 
Adds a no_clone modifier
 2017-10-01 13:29:25 -04:00
Neerti
4a0ef92303 Merge pull request #3985 from Anewbe/crabs 
Adds giant crabs
 2017-10-01 13:28:30 -04:00
Anewbe
e2e1493112 Makes the boots of speed slower, and boots. 2017-10-01 12:11:16 -05:00
Anewbe
b47ac1d76c Merge pull request #3991 from MisterLayne/9/30/17_BetterTRAY 
Better T-Ray Scanners
 2017-10-01 10:58:35 -05:00
Anewbe
5828e126fe Merge pull request #3995 from Cameron653/patch-5 
Removes second definition of katana
 2017-10-01 10:43:03 -05:00
Neerti
bc6f98c23a Merge pull request #3987 from Anewbe/frost_spider_poi 
Adds a frost spider nest PoI, adds frost spider things
 2017-10-01 01:26:55 -04:00
Anewbe
ab0c05bdf7 Merge pull request #3988 from Mechoid/Mecha_2_The_Mechening_V_1 
Brain-Mech fix, MMI Runtime fix, Mecha Wall Punching Fix
 2017-09-30 21:44:59 -05:00
Anewbe
03abb61e2e Merge pull request #3989 from Neerti/9/30/2017_shield_tweaks 
Directional Shield Tweaks
 2017-09-30 21:43:27 -05:00
Anewbe
4dd9a4dbf2 Corrects the autospawn pod timer 2017-09-30 21:38:23 -05:00
Neerti
459fbbdc2a Merge pull request #3952 from Anewbe/slimejelly 
Makes it possible to get slimejelly
 2017-09-30 17:47:27 -04:00
Cameron653
9b7ed4fbcc Katana was defined twice 2017-09-30 17:35:11 -04:00
MisterLayne
568c9554ed Adds better Tscanners. 2017-09-30 10:59:38 -04:00
Anewbe
d067f70403 Adds the thing that spawns the gravekeeper drone 2017-09-30 02:00:10 -05:00
Mechoid
77f0e7514c Combat exosuits can now actually punch through walls and girders again, based on their 'force'. Fixes some to_chat's. 2017-09-29 22:10:48 -07:00
Neerti
42fe0c1f9f Directional Shield Tweaks 
Shields now give a visual indicator of health by shifting towards a red color as the health gets closer to zero.
AI turrets will no longer give up in despair and not even try to kill people hiding in shields.
Adds weaker variant of the shield projector, with smaller radius and health more suited to one on one engagement verses the base shield being tuned for teamfighting.
 2017-09-30 00:25:49 -04:00
Mechoid
058aae2983 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Mecha_2_The_Mechening_V_1 2017-09-29 20:32:23 -07:00
Mechoid
b4a323ec38 Fixes Brain-Mechs, and a tangentially related MMI runtime. 2017-09-29 20:29:30 -07:00
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
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
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
Anewbe
efa89a9650 Splits the robot_modules file. Continues work on gravekeeper drone. 2017-09-29 01:02:53 -05: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