cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,197 Commits 10 Branches 0 Tags
05f83497fd918e21dadeefab109dfd88ed076349
Commit Graph

26333 Commits

Author SHA1 Message Date
Neerti
05f83497fd Merge pull request #4105 from Anewbe/event_manager 
Does work on the event manager role again
 2017-10-20 15:16:50 -04:00
mistyLuminescence
b99b8a025f New halloween outfit + pirate outfit fix (#4106) 
* spooky

* whitoeut?? what's that
 2017-10-20 01:27:52 -05:00
Mechoid
920e823a46 Fuel-Rod Gun, Minor fixes related. (#4103) 
* A whole load of things.

* Fixes the SM Rod's travel distance.
 2017-10-19 15:07:52 -05:00
Mechoid
8939d21014 Stops MMIs created with a ghosted brain from being put into cyborgs. (#4110) 
* Stops MMIs created with a ghosted brain from being put into cyborgs.

* Fixes a typo and wording.
 2017-10-19 13:59:06 -05:00
Belsima
aacb9d4c04 Updates chaplain files. (#4102) 
* Updates chaplain files.

* Talmudic, not Tulmudic.
 2017-10-19 09:36:40 -05:00
mistyLuminescence
e76447a719 Loadout stuff, but done right! (#4094) 
* Loadout and accessory path tweaks.

* updated: armbands

* except it's better now

* no ian shirt and psych medHUD, travis fixed?

* OKAY ROUND THREE
 2017-10-19 09:36:15 -05:00
Anewbe
ef735ea89b Merge pull request #4098 from Neerti/10/15/2017_surface_stuff 
Touches Up the Surface Somewhat
 2017-10-19 09:36:03 -05:00
Neerti
f726e96fe7 Merge pull request #4097 from Anewbe/mrate_static 
Removes mrate_static on some chems
 2017-10-18 23:59:05 -04:00
Anewbe
cad5ef12e7 Does work on the event manager role again 2017-10-18 20:00:01 -05:00
Neerti
4208cfb29d Merge pull request #4093 from Anewbe/hoodies 
Touches up the hoodie sprites
 2017-10-18 18:41:16 -04:00
Neerti
95d93dae00 Touches Up the Surface Somewhat 
Changes the rock texture to hopefully be a bit better.  It's a recolored version of /tg/'s lavaland rock, and modified slightly to look less repetitive.
Ports the lavaland rock tile sprite entirely for future away missions.
Adds tree chopping down feature.  All trees now have health, and hitting it with things will reduce it.  Generally you need something sharp to have a chance of actually felling the tree.
Adds log material, which is obtained from chopping trees.  Hitting these with a sharp weapon converts them into two planks per log.  Can be used to build log walls but otherwise can't be used to craft, at the moment.
Ports /tg/ tree sprites.  Might have a use for them in away missions, who knows.
Makes crystals start anchored and glow.
Shoveling snow checks toolspeed now.
 2017-10-18 12:04:39 -04:00
Anewbe
c11fee54a4 Removes mrate_static on some chems 2017-10-17 23:39:03 -05:00
mistyLuminescence
799a51ec60 Adds expensive antag crate to Cargo (#4086) 
* Adds expensive antag crate to Cargo

* Fixing code bugs

* thanks travis

* travis why

* aaaa.

* AAAAAAAAAA

* RIG crate removed per request
 2017-10-17 20:13:00 -05:00
Neerti
8a4b5b2ece Merge pull request #4090 from Anewbe/custom_backpacks 
Custom backpacks overwrite a worn backpack
 2017-10-17 19:48:14 -04:00
Anewbe
72ab35f6f9 Merge pull request #4085 from mistyLuminescence/cargonialandicallmyhome 
Sell thaler for cargo points!
 2017-10-17 15:49:07 -05:00
Anewbe
90a1b1c851 Adds the NRTI hoodie 2017-10-17 14:19:08 -05:00
Anewbe
fcce3a3b58 Custom backpacks overwrite a worn backpack 2017-10-16 23:42:23 -05:00
Anewbe
4a6cf66183 Merge pull request #4087 from Mechoid/Efficient_Me_Fabricators 
Fixes SCIENCE-fabs, Changes Mech-fab Sprite.
 2017-10-16 23:01:43 -05:00
Spades
edfa947278 These are not Vorestation edits. (#4088) 
Y'all are confusing the shit out of us.
 2017-10-16 23:01:30 -05:00
elgeonmb
36fa36586a fixed double periods when ghost-texting 2017-10-16 19:41:30 -07:00
Neerti
5af9c1971d Merge pull request #4077 from Anewbe/rings 
Rings
 2017-10-16 19:04:36 -04:00
Neerti
d42edb679b Merge pull request #4069 from Anewbe/costumes 
Halloween Costume Outfits
 2017-10-16 19:01:25 -04:00
Anewbe
d886e52ac3 Merge pull request #4080 from shazbot194/Synth_color 
Synth Coloring
 2017-10-16 17:55:24 -05:00
Neerti
9ae54fb2ac Merge pull request #4083 from Anewbe/trait_fix 
Trait tweaks
 2017-10-16 18:51:01 -04:00
Neerti
7b5f8bddd1 Merge pull request #4081 from Cameron653/512_FILTER_FIX 
BYOND 512 Compiling Errors Fix
 2017-10-16 18:47:47 -04:00
Mechoid
b43201aa79 Fixes the circuit printer and protolathe's material cost check as well. Updates this local to match Master. 2017-10-16 13:12:08 -07:00
Anewbe
4f86947108 Merge pull request #4079 from Mechoid/Organ_Harvesting_Not_Included 
Prosthetic Organ Expansion
 2017-10-16 14:21:19 -05:00
Mechoid
83eb259080 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Efficient_Me_Fabricators 2017-10-16 12:03:44 -07:00
Anewbe
b14766ff92 Merge pull request #4078 from Mechoid/Projectile_Turretfunctions 
Turret Targetting Update
 2017-10-16 14:03:05 -05:00
Mechoid
4a71de6b62 Mech and Prosthetic Fabricators now check to make sure they have the correct amount of material, respecting upgrades, rather than the base object cost. 2017-10-16 12:02:46 -07:00
mistyLuminescence
242b0dba20 Sell thaler for cargo points! 2017-10-16 18:58:07 +01:00
Anewbe
fc59e6ee4c Merge pull request #4076 from Kholdstare34/outbox 
Adds heads of staff cloaks, adds them to the loadout.
 2017-10-16 04:27:30 -05:00
mistyLuminescence
f87a6d7d8c Adds a white robe. (#4074) 
* - Adds a hooded robe themed after the Rishizirr, the mythological Tajaran angels of death said to shepherd the souls of those who die while snowed in to their designated afterlife. Perfect for Hallowe'en!

* Adds a hooded white robe.

* Fixes the white robe.

* Fixes the robe, again
 2017-10-16 04:27:03 -05:00
Anewbe
03aa2d691d Trait tweaks 2017-10-16 01:07:56 -05:00
Anewbe
c2b7542c4e Merge pull request #4075 from Mechoid/NANOMACHINES_SON 
Fixes roboheads being crammed onto flesh-bodies.
 2017-10-16 01:04:18 -05:00
Anewbe
dc0d445383 Merge pull request #4073 from Mechoid/Knight_Of_The_Living_Shield 
Dead bodies are no longer perfect shields.
 2017-10-16 00:37:10 -05:00
killer653
fb8ba69ada Fixes all the other stuff 2017-10-15 20:56:13 -04:00
killer653
0080539924 More fixes 2017-10-15 19:54:50 -04:00
killer653
0f20177c5f Some more fixes 2017-10-15 19:02:26 -04:00
killer653
3cd3054811 Fixes filter being used, which prevented compiling 2017-10-15 19:01:55 -04:00
shazbot194
d199d4caf7 Adds in the option to color all synth parts and two sets of parts 
As the titles says
 2017-10-15 14:56:14 -08:00
Mechoid
a9e9236d7f Prosthetic Organ Expansion 2017-10-15 15:12:51 -07:00
Mechoid
9a04744ab6 Turrets detect targets through metal foam. 2017-10-15 13:48:38 -07:00
Anewbe
35dd1a957e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into rings 2017-10-15 15:07:21 -05:00
Anewbe
3c2831e5d9 Adds rings 2017-10-15 15:05:52 -05:00
Ansari
768dc2d7c0 Port over Chemistry bag from Paradise (#4067) 
* Add in chemistry bag from Paradise, based on /tg/ bag. Add it to biogenerator. Add it to wardrobe.

* Make itemsize large so it cannot be put in backpack. Slowdown = 1.
 2017-10-15 15:04:56 -05:00
elgeonmb
9213d36bfb Adds new names to the NT ship list (#4064) 
* adds new names to the NT ship list

a bunch of overlooked scientists, also Jans and Friede of the "you must be this smart to ride this ride" positronic test

* removes duplicate tesla
 2017-10-15 15:04:26 -05:00
Kholdstare34
becc2e4290 Adds heads of staff cloaks, adds them to the loadout. 2017-10-15 15:02:25 -05:00
Mechoid
e21b65ec85 Nails the Parentheses back on. 2017-10-15 11:13:46 -07:00
Mechoid
ee4df4f862 Fixes roboheads being crammed onto flesh-bodies. 2017-10-15 11:01:20 -07:00