cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,301 Commits 8 Branches 0 Tags
0c4e88ec321fdf38d3388f85af32f8412c30212d
Commit Graph

13315 Commits

Author SHA1 Message Date
Anewbe
0c4e88ec32 Adjusts how radiation works, especially for FBPs 2017-10-28 14:08:48 -05:00
Anewbe
ff3420a5df Merge pull request #4180 from Belsima/ruleb 
WITH exceptions!
 2017-10-28 10:37:52 -05:00
Belsima
e156bb4d1e WITH exceptions! 2017-10-28 10:15:38 -04:00
Anewbe
966749b5f4 Merge pull request #4168 from Neerti/10/27/2017_lag_fix 
Proto/Autolathe lag fix
 2017-10-28 02:13:12 -05:00
Mechoid
ec9dded0cc Merge pull request #4151 from MisterLayne/LanguageModule 
Cyborg Language Module
 2017-10-27 10:24:07 -07:00
Neerti
e935df9702 Proto/Autolathe lag fix 
Makes the two machines concatenate a lot less and not make BYOND's super secret string tree cry, hopefully.
 2017-10-27 04:00:44 -04:00
Neerti
2c8d0f5ac8 Merge pull request #4156 from Anewbe/outfit_tweaks 
Adjusts outfits again
 2017-10-26 19:56:43 -04:00
Anewbe
65eb398677 Fixes the access config issue 2017-10-26 17:34:15 -05:00
MisterLayne
436eaa1efb Adds language module. 2017-10-26 15:43:25 -04:00
Anewbe
073fd9524c Adjusts outfits again 2017-10-25 02:24:15 -05:00
Mechoid
6825aea71e Merge pull request #4109 from Anewbe/thug 
Adds a Thug antag type, for admin use
 2017-10-24 09:58:51 -07:00
Ansari
169f2c0e0a Cloning machine now auto process meat (#4137) 
* Cloning machine now auto process meat(And meatball and meatpie and meatsteak)

* Prevent chatspam

* Format text
 2017-10-23 19:34:26 -05:00
Anewbe
5edf4c30c7 Merge pull request #4141 from ForFoxSake/master 
Small Window Damage Tweak
 2017-10-23 10:56:45 -05:00
Neerti
bdbbab4650 Merge pull request #4133 from Anewbe/firestorm 
Rebalances Firestorm
 2017-10-23 02:44:51 -04:00
Neerti
939eb042f2 Merge pull request #4144 from Anewbe/botanists 
Botanists should show up in the proper part of the manifest
 2017-10-23 00:38:50 -04:00
Anewbe
7a36a8cfb6 Merge pull request #4118 from mistyLuminescence/cryostorage 
Reworks cryopod storage
 2017-10-22 19:03:07 -05:00
Anewbe
6774a1b5f2 Merge pull request #4129 from Belsima/centcolor 
Recolors some CentComm items to use NT colors.
 2017-10-22 18:55:21 -05:00
Anewbe
94306a9947 Botanists should show up in the proper part of the manifest 2017-10-22 18:52:18 -05:00
ForFoxSake
d7c9eef7e1 Makes windows less invulnerable. 2017-10-22 13:26:39 +01:00
Anewbe
6a52111680 Merge pull request #4116 from Neerti/10/20/2017_syndie_borgs_are_back 
Syndicate Borgs II, Return of the Salt
 2017-10-21 13:58:52 -05:00
Anewbe
a0ed4365f0 Rebalances Firestorm 2017-10-21 13:58:19 -05:00
Belsima
8363f34044 Recolors some CentComm items to use NT colors. 2017-10-21 09:21:20 -04:00
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
ae308a3a91 Reworks cryopod storage 2017-10-20 19:14:45 +01:00
Neerti
9c0ac5ec2a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 10/20/2017_syndie_borgs_are_back 2017-10-20 13:26:06 -04:00
Neerti
1aff3fc8c0 Syndicate Borgs II, Return of the Salt 
Adds an option in mercenary uplinks to purchase three different 'classes' of drones.
See PR for more details.
 2017-10-20 13:01:45 -04: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
Anewbe
47d644fb9b Adds a Thug antag type, for admin use 2017-10-19 09:53:20 -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
Anewbe
cad5ef12e7 Does work on the event manager role again 2017-10-18 20:00:01 -05: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
72ab35f6f9 Merge pull request #4085 from mistyLuminescence/cargonialandicallmyhome 
Sell thaler for cargo points!
 2017-10-17 15:49:07 -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
7b5f8bddd1 Merge pull request #4081 from Cameron653/512_FILTER_FIX 
BYOND 512 Compiling Errors Fix
 2017-10-16 18:47:47 -04: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
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
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
Mechoid
9a04744ab6 Turrets detect targets through metal foam. 2017-10-15 13:48:38 -07:00