01aaccf893
Finishes UFO PoI
2017-11-26 15:10:25 -05:00
ab83bb90be
One Crew Member
2017-11-26 12:28:59 -05:00
5b0b639377
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 11/26/2017_ufo_poi
...
# Conflicts resolved:
# maps/submaps/cave_submaps/cave_areas.dm
2017-11-26 12:09:55 -05:00
7497aef295
work
2017-11-26 12:08:05 -05:00
d524d721b9
Merge pull request #4335 from Neerti/11/22/2017_explorer_gear
...
Adds Exploration Equipment
2017-11-25 14:39:12 -06:00
8ac2100fa2
Adds Exploration Equipment
...
Ports and tweaks the Explorer gear from /tg/. Recolored to remove the mining purple, instead its now a nice blue because winter, I suppose.
Adds a new survival knife that is bootknife ready.
Replaces xenoarch GPS with budget /tg/ GPS that is more useful, as it can track other GPSes.
2017-11-24 07:22:35 -05:00
9ba6d5759a
Fixes 'reques console'
2017-11-22 18:25:49 -05:00
62d76cba30
Merge pull request #4318 from Mechoid/Mechoid_Has_The_Keys_And_A_Brick_On_The_Pedal
...
Adds more Spiders. Touches cuff-code tangentially.
2017-11-22 01:13:04 -06:00
d5404ae0eb
Adds More Spiders. Touches cuff-code tangentially.
2017-11-21 12:59:06 -08:00
cc616148e3
Merge pull request #4291 from mistyLuminescence/FisforFriendswhoDoStuffTogether
...
Adds bracelets!
2017-11-21 01:32:35 -05:00
d36d09d937
Merge pull request #4176 from Anewbe/battery_things
...
Swaps non-mounted recharging guns to batteries
2017-11-19 21:28:06 -05:00
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
d8b26358ce
Merge pull request #4278 from Anewbe/defib_charge
...
Successful Defibs are more costly, chargewise.
2017-11-19 17:50:13 -05:00
595f874f9b
Merge pull request #4264 from Anewbe/decap_defib
...
Decapitation now stops defibrillation
2017-11-19 17:50:03 -05:00
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
fd7990028f
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into battery_things
2017-11-19 02:38:42 -06:00
73da109d2d
Revert "Ace didn't write this version"
...
This reverts commit 73a1a6a432
2017-11-18 10:57:36 -05:00
73a1a6a432
Ace didn't write this version
2017-11-18 10:57:03 -05:00
db4480495b
Fixes Chain of Command guide book
2017-11-18 10:56:04 -05:00
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
98787bc2ef
Merge pull request #4285 from mistyLuminescence/defibghost
...
Fixes ghost defib message bug
2017-11-17 20:12:57 -06:00
463b9c4dfb
Edited files
2017-11-17 19:28:26 -05:00
da0bf3743b
Polaris sync
2017-11-17 19:27:03 -05:00
9191bfe6f7
Adjusts original PR as per Staff request
2017-11-17 16:11:05 -06:00
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
d1d5ec3887
Merge pull request #4271 from Mechoid/Nano-Pasta
...
Nanopaste Tweaks
2017-11-17 15:59:14 -06:00
3a19bf7c2b
Fixes ghost defib message
2017-11-17 21:28:41 +00:00
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
0d9a175aac
Adds bracelets!
2017-11-17 18:27:35 +00:00
f9b90b98ed
Standardization & grammar.
2017-11-17 13:18:32 -05:00
27f0f44222
Successful Defibs are more costly, chargewise.
2017-11-16 23:56:55 -06:00
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
56257b302a
Merge branch 'gimmicktraits' of https://github.com/Verkister/VOREStation into gimmicktraits
2017-11-15 17:52:47 +02:00
a5ff9415fa
Merge branch 'master' of https://github.com/VOREStation/VOREStation into gimmicktraits
...
# Conflicts:
# code/modules/mob/living/carbon/human/species/station/blank_vr.dm
2017-11-15 17:52:15 +02:00
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
8c1fb156be
Adds a cosmetic "armor vest" taur saddlebag subtype.
...
-Works with 4-legged taurs as the other taurbags.
-Has normal backpack stats whereas the other saddlebags have duffle stats.
2017-11-14 16:18:47 +02:00
fa48060644
darn capitalism
2017-11-14 09:43:52 +02:00
a5e3ddd948
items cannot forcemove?
2017-11-14 09:42:38 +02:00
ec413c1288
Update trash_vr.dm
2017-11-14 09:33:23 +02:00
f5e831050b
Decapitation now stops defibrillation
2017-11-14 01:15:29 -06:00
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
70e53b96bb
Polaris Sync
2017-11-10 11:37:41 -05:00
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
11c195debb
Polaris Sync
2017-11-04 13:37:13 -04:00
8560a35ec3
fixed megaphone lore
2017-11-04 01:59:00 -07:00
d5f582013f
Reagent generator implants now support multiple reagents at once.
2017-11-04 01:04:37 -04:00
fce9fe2c72
Merge pull request #4188 from Atermonera/VR_2
...
Virtual Reality
2017-11-03 15:10:53 -05:00
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
6611cb271b
Merge pull request #4190 from mistyLuminescence/plushierework2561
...
Plushie tweaks!
2017-11-01 21:57:56 -05:00
794bd0ab6f
Adds a mounted welder to the welderpacks in engineering.
2017-10-31 20:07:14 -07:00
Neerti