Commit Graph

3997 Commits

Author SHA1 Message Date
Neerti
cc616148e3 Merge pull request #4291 from mistyLuminescence/FisforFriendswhoDoStuffTogether
Adds bracelets!
2017-11-21 01:32:35 -05:00
Neerti
d36d09d937 Merge pull request #4176 from Anewbe/battery_things
Swaps non-mounted recharging guns to batteries
2017-11-19 21:28:06 -05:00
Anewbe
1fb2e32e2f Merge pull request #4297 from Neerti/11/18/2017_make_syndie_toolboxes_special_again
Makes Syndie Toolboxes Special Again
2017-11-19 17:25:44 -06:00
Neerti
d8b26358ce Merge pull request #4278 from Anewbe/defib_charge
Successful Defibs are more costly, chargewise.
2017-11-19 17:50:13 -05:00
Neerti
595f874f9b Merge pull request #4264 from Anewbe/decap_defib
Decapitation now stops defibrillation
2017-11-19 17:50:03 -05:00
Belsima
594625cf81 Adds force to a pair of items that were lacking for some reason, and standardizes light replacer file. (#4280)
* Adds force to lamps.

* Standardization.

* Standardizes a few things.

* Grammar that I missed.

* Some more missed grammar.
2017-11-19 02:52:56 -06:00
Anewbe
fd7990028f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into battery_things 2017-11-19 02:38:42 -06:00
Neerti
4263a9b70b Makes Syndie Toolboxes Special Again
The syndie toolboxes have been split into two versions, one with the old contents pre-powertools and one with the current powertools. Both are in the uplink, however only the regular tool version of the syndie toolbox can be found in maint now. This is to make power tools less commom, as there are several spots where syndie toolboxes are guaranteed to spawn at,  and it made the CE's tools less special.
2017-11-18 08:06:38 -05:00
Anewbe
98787bc2ef Merge pull request #4285 from mistyLuminescence/defibghost
Fixes ghost defib message bug
2017-11-17 20:12:57 -06:00
Anewbe
9191bfe6f7 Adjusts original PR as per Staff request 2017-11-17 16:11:05 -06:00
Anewbe
2a55433ca9 Merge pull request #4276 from Neerti/11/16/2017_get_out_of_here_stalker
Tweaks Geiger Counters
2017-11-17 16:05:40 -06:00
Anewbe
d1d5ec3887 Merge pull request #4271 from Mechoid/Nano-Pasta
Nanopaste Tweaks
2017-11-17 15:59:14 -06:00
mistyLuminescence
3a19bf7c2b Fixes ghost defib message 2017-11-17 21:28:41 +00:00
Mechoid
fd287ec671 Nanopaste functions once more as an advanced damage kit for FBPs, ignoring the damage-limit of welders and cables. Now has a use-time for borgs and normal repair. 2017-11-17 11:44:07 -08:00
mistyLuminescence
0d9a175aac Adds bracelets! 2017-11-17 18:27:35 +00:00
Belsima
f9b90b98ed Standardization & grammar. 2017-11-17 13:18:32 -05:00
Anewbe
27f0f44222 Successful Defibs are more costly, chargewise. 2017-11-16 23:56:55 -06:00
Neerti
810f7e694d Tweaks Geiger Counters
Geiger counters now have sounds, which I took from https://freesound.org/people/leonelmail/sounds/328381/ and chopped it up into several .oggs. The license is CC0 (public domain) so it'll fit with our license.
The Geiger counter now turns yellow at any sign of radiation instead of at 5 units, since below five units is still harmful.
Examining the Geiger counter updates the radiation count immediately.
2017-11-16 18:13:29 -05:00
Neerti
09105a55b7 Fixes Bandage Spam Exploit
Removes ability to circumvent bandage limits by spamclicking someone. The check if its already bandaged is done twice, once at the start and once after the delay.
Replaces a lot of user << with to_chat().
2017-11-14 22:32:45 -05:00
Anewbe
f5e831050b Decapitation now stops defibrillation 2017-11-14 01:15:29 -06: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
elgeonmb
8560a35ec3 fixed megaphone lore 2017-11-04 01:59:00 -07:00
Anewbe
fce9fe2c72 Merge pull request #4188 from Atermonera/VR_2
Virtual Reality
2017-11-03 15:10:53 -05: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
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
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
Anewbe
c9cbbd3a9b Swaps non-mounted recharging guns to batteries 2017-10-27 20:43:31 -05:00
Mechoid
ec9dded0cc Merge pull request #4151 from MisterLayne/LanguageModule
Cyborg Language Module
2017-10-27 10:24:07 -07: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
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
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
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
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
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
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
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
Neerti
0a3d85647a Merge pull request #4011 from Anewbe/railgun
Ports Bay's railguns, and assorted gun sprites
2017-10-14 01:43:45 -04:00
Belsima
e61efc752a more gammers (#4052)
* Update medsci.dm

* Update miscellaneous.dm

* Update arcade.dm

* Update transform.dm

* Update implanter.dm

* Update shuttle_console.dm
2017-10-13 23:32:22 -05:00