cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,303 Commits 8 Branches 0 Tags
ff4be8c2e260c9157ebc876770184d3f103686f8
Commit Graph

26429 Commits

Author SHA1 Message Date
Neerti
7266310755 Merge pull request #4025 from Anewbe/prosthetic_organs 
Prosthetic Organs Tweaks
 2017-10-06 01:18:16 -04:00
Neerti
ce1dd6b9fa Merge pull request #4022 from elgeonmb/tracomtweak 
Tracom tweak 2.0
 2017-10-06 01:13:15 -04:00
Neerti
2c4a143128 Merge pull request #4016 from Anewbe/snowshoes 
Adjusts checks for turf-slowed movement
 2017-10-06 01:12:07 -04:00
Anewbe
098bb66e4a Makes landmarks invisible, mobcorpse landmark actually despawns 2017-10-05 21:44:26 -05:00
Anewbe
9d5dd1cc48 Allows use of more internal prosthetic organs 2017-10-05 20:42:03 -05:00
MisterLayne
8aed98be14 Adds science dufflebag 2017-10-05 16:26:56 -04:00
Neerti
4b1eb3a19a Merge pull request #4017 from Anewbe/lawbook 
Adds Neerti's Law Book
 2017-10-05 12:56:23 -04:00
elgeonmb
18e60b0f57 Update organizations.dm 2017-10-05 01:18:46 -07:00
Anewbe
66837464d2 Implanters should have an icon again 2017-10-04 23:07:59 -05:00
Anewbe
152cf3362c Finishing touches on outfit code 2017-10-04 21:55:55 -05:00
Anewbe
82f24079f4 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into outfits 
# Conflicts:
#	code/game/jobs/job/assistant.dm
#	code/game/jobs/job/civilian.dm
#	code/modules/admin/admin_verbs.dm
 2017-10-04 20:08:55 -05:00
Anewbe
10b0264c6a Yet more work on the Outfit System 2017-10-04 20:05:20 -05:00
Neerti
4db89d42f5 Merge pull request #4014 from Anewbe/drone_permits 
Drone permits can now be worn
 2017-10-04 20:59:29 -04:00
elgeonmb
4fe72daba3 curlyboy 2017-10-04 17:31:16 -07:00
elgeonmb
5361299b9f Update organizations.dm 2017-10-04 17:30:13 -07:00
elgeonmb
1cb7f36c6c Adds new organization-specific locations in the tracon module 
and misc tweaks.

1) Adds systems with lore and trade with SCG to the generic destinations list

2)Gives Vey-Med some Skrell-focused destinations

3)Gives Heph some millitary destinations

4)Gives Morpheus trade with Shelf

5)Strips out the "Icarus" generic ship name and the NDV Icarus Nanotrasen destination. Suddenly this word has a lot of history and I somehow don't see NT naming a ship after the political party they're bitterly opposed to
 2017-10-04 17:18:43 -07:00
Anewbe
4459d7087a Revert "Does more prep for the Event Manager role" 2017-10-04 18:33:34 -05:00
Anewbe
cf9245b5fb More work on outfits 2017-10-04 11:49:24 -05:00
Anewbe
094df467a9 Continues work on Outfits 2017-10-04 01:14:09 -05:00
Anewbe
2fde466a21 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into outfits 2017-10-03 23:24:12 -05:00
Anewbe
0de6cddef5 Activates Neerti's Lawbook 2017-10-03 22:29:50 -05:00
Neerti
24f517336b Merge pull request #4013 from Anewbe/event_rank 
Does more prep for the Event Manager role
 2017-10-03 23:26:01 -04:00
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
52093c1d48 Adjusts checks for turf-slowed movement 2017-10-03 17:54:56 -05:00
Anewbe
46994b378d Adds a null check for not having a backpack 2017-10-03 16:16:35 -05:00
Anewbe
b393bb897d Repaths permits as accessories 2017-10-03 00:04:58 -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
Anewbe
bf6c9ba4b8 Drone permits can now be worn 2017-10-02 23:14:14 -05:00
Anewbe
c2c6b5949a Does more prep for the Event Manager role 2017-10-02 21:51:48 -05: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
a248a4a4a1 Ports Bay's railguns, and assorted gun sprites 2017-10-02 17:29:24 -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
Anewbe
d0a22df9c3 Continues work on outfits 2017-10-01 20:50:30 -05: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