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

13911 Commits

Author SHA1 Message Date
killer653
e9585bfc6d Allows flight with wings. 2017-10-28 19:51:14 -04:00
Spades
db8a51cf98 Merge pull request #2380 from Cameron653/master 
Polaris Sync
 2017-10-28 11:18:35 -04:00
Spades
a983cc5882 Merge pull request #2358 from Verkister/nifting 
Fixes initial nif backups.
 2017-10-27 17:42:30 -04:00
killer653
315711b314 Pol sync part 2 2017-10-27 15:30:51 -04:00
killer653
0c480ec15f Polaris sync 2017-10-27 15:30:24 -04:00
Mechoid
ec9dded0cc Merge pull request #4151 from MisterLayne/LanguageModule 
Cyborg Language Module
 2017-10-27 10:24:07 -07: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
Spades
0bf340762e Books! And HoS office improvements! 
- HoS office now has a camera because fuck you that's why.
- HoS office and Security wing now have Security wall radios.
- Fixed Security wall radio icons.
- Fixed direction icons of all radios on the map.
- Added SOP book.
- Added Command Guide book (Chain of Command).
 2017-10-23 23:10:01 -04: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
Verkister
9b567832f4 Fixes initial nif backups and adds a flashlight nifsoft. 
-Nif tested preserving even with initial one-time backups.
-Moved some junk around.
-Added a flashlight nifsoft (costs 350, light range 3)
 2017-10-23 16:26:36 +03: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
Spades
0e82f4f3bf Merge pull request #2332 from Verkister/backuppery 
Adds a mind backup nifsoft and fixes sleevemate nif and quit issues.
 2017-10-21 23:17:49 -04:00
Spades
8737b2b65e Merge pull request #2338 from Yewmi/halloween-punkin 
Adds halloween pumpkins and jack-o'lanterns
 2017-10-21 23:13:43 -04: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
Yumi (AKA Gowst)
7b87993993 Adds halloween pumpkins and jack-o'lanterns, pumpkins replaces all potted plants on station 2017-10-20 00:52:16 -05:00
Verkister
1dce46894a Should fix bypassing the round quit with sleevemate 2017-10-20 03:12:58 +03: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
Cameron653
3dcb301391 Assistant fix 2017-10-18 14:10:31 -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
Cameron653
35afdc29c9 Fixes a 512 compile error. 2017-10-17 23:40:07 -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
killer653
280722332b Part 2 2017-10-16 22:17:14 -04:00
killer653
1bb71ef429 Polaris Sync 2017-10-16 22:16:24 -04: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