Commit Graph

6835 Commits

Author SHA1 Message Date
Verkister
c1f16e080e Adds 2 neutral gimmick traits and borgo feeding.
-Trait 1, "Hard Feet" makes your feet glass shard resistant.
-Trait 2, "Trash Can" lets you dispose of snack wrappings on the go without littering or having to quest out in search of a disposal bin.
-Also adds trash feeding for janiborgo in a sibling snippet for the forementioned trait.
-Also added the old citadel era "robo kibble" to give the custom trash code file a first custom "trash" as well. Only in the code for now, not mechfab printable yet.
-I'm gonna toss Polaris an update that makes borgs not become sparkles on 0 force item paps brb.
2017-11-13 20:01:58 +02:00
Cyantime
ce21d46c7d Can't open blast doors with your face 2017-11-12 16:40:41 -05:00
killer653
70e53b96bb Polaris Sync 2017-11-10 11:37:41 -05:00
Sabess
c96781499f Allows detectives to take an optional revolver + some other stuff (#4217)
* I'm like 99% sure this works

* uhm

* accidentally broke something after I tested but before I PRed, fixed now
2017-11-05 22:53:11 -06:00
Anewbe
1126523497 Merge pull request #4202 from mistyLuminescence/mappingstuff
Chemist and Psychiatrist locker fixes, for real this time.
2017-11-05 20:08:34 -06:00
killer653
11c195debb Polaris Sync 2017-11-04 13:37:13 -04:00
Spades
7ff4a6434e Merge pull request #2410 from Cyantime/reagentratios
Reagent generator implants now support multiple reagents at once.
2017-11-04 13:08:35 -04:00
elgeonmb
8560a35ec3 fixed megaphone lore 2017-11-04 01:59:00 -07:00
Cyantime
d5f582013f Reagent generator implants now support multiple reagents at once. 2017-11-04 01:04:37 -04:00
Anewbe
7e62570129 Merge pull request #4205 from MisterLayne/LostDroneCharger
Lost Drone Pod Charger
2017-11-03 23:38:43 -05:00
mistyLuminescence
41f332df42 fuck this pr PART TWO 2017-11-04 00:00:07 +00:00
mistyLuminescence
a0c5ecb8d5 UPDATES IT FOR REAL THIS TIME 2017-11-03 23:29:14 +00:00
Anewbe
516b7e7c2d Merge pull request #4206 from Cyantime/windos
Minor window fixes
2017-11-03 16:11:27 -05:00
Anewbe
0c6a93e38c Merge pull request #4203 from Verkister/loadandblend
Enables the combo blend mode for most colorable loadout gear.
2017-11-03 15:11:37 -05:00
Anewbe
fce9fe2c72 Merge pull request #4188 from Atermonera/VR_2
Virtual Reality
2017-11-03 15:10:53 -05:00
MisterLayne
2be106026b Makes lost drone pod charger-able. 2017-11-03 14:26:59 -04:00
Cyantime
31f5321dcc Window things 2017-11-02 23:58:20 -04:00
Anewbe
303b7096ef Merge pull request #4194 from Mechoid/Welderpack_Tanks
Adds a mounted welder to the welderpacks in Engineering.
2017-11-02 20:38:10 -05:00
Verkister
26ea6ec92d Enables the combo blend mode for most colorable loadout gear.
-The most meaning the colorable uniforms, suits, gloves, shoes, headgear, earwear, and accessories.
-Only affects mob icons for now, the inventory/floor icons still in old blend.
-Sort of a framework for possible additional options to come.
-Also messed around with some other stuff such as adding on-ear icons to the rest of the flower pins and bows, and made the base icons for the beanies lighter than the middle gray they were.
2017-11-02 15:33:52 +02:00
Anewbe
6611cb271b Merge pull request #4190 from mistyLuminescence/plushierework2561
Plushie tweaks!
2017-11-01 21:57:56 -05:00
Mechoid
794bd0ab6f Adds a mounted welder to the welderpacks in engineering. 2017-10-31 20:07:14 -07:00
Anewbe
73ad06c706 Botanist ID now has the proper default job/title 2017-10-31 20:41:15 -05:00
killer653
5790e1c5d4 Makes stumbling into something make you stop flying 2017-10-31 19:17:16 -04:00
mistyLuminescence
eef59a1bbc tweaks v2 2017-10-31 20:49:17 +00:00
mistyLuminescence
f67a3858cd Plushie tweaks! 2017-10-31 15:47:00 +00:00
Atermonera
64942bd04c VR Core 2017-10-30 22:32:36 -07:00
Woodratt
e639887584 SC Arrivals Shuttle fix
- Fixes issues with the SC arrivals shuttles in regards to airlocks
- New Shuttle seats, ported from Vorestation
2017-10-30 15:56:44 -07: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
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
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
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
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
Belsima
8363f34044 Recolors some CentComm items to use NT colors. 2017-10-21 09:21:20 -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