Spades
73da109d2d
Revert "Ace didn't write this version"
...
This reverts commit 73a1a6a432 .
2017-11-18 10:57:36 -05:00
Spades
73a1a6a432
Ace didn't write this version
2017-11-18 10:57:03 -05:00
Spades
db4480495b
Fixes Chain of Command guide book
2017-11-18 10:56:04 -05:00
killer653
463b9c4dfb
Edited files
2017-11-17 19:28:26 -05:00
killer653
da0bf3743b
Polaris sync
2017-11-17 19:27:03 -05: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
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
Belsima
f9b90b98ed
Standardization & grammar.
2017-11-17 13:18:32 -05: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
mistyLuminescence
0431c2d23c
Changes the old hyposprays to the new hyposprays. ( #4223 )
...
* Hypospray mk1 -> Hypospray mk2
* Medical random spawns no longer have the new hypo.
* Medic syndiecrate now has the old hypo
2017-11-15 16:31:50 -06:00
Verkister
56257b302a
Merge branch 'gimmicktraits' of https://github.com/Verkister/VOREStation into gimmicktraits
2017-11-15 17:52:47 +02:00
Verkister
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
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
Verkister
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
Verkister
fa48060644
darn capitalism
2017-11-14 09:43:52 +02:00
Verkister
a5e3ddd948
items cannot forcemove?
2017-11-14 09:42:38 +02:00
Verkister
ec413c1288
Update trash_vr.dm
2017-11-14 09:33:23 +02:00
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
Mechoid
34eef27b7b
Merge pull request #4215 from Anewbe/gym_equipment
...
Ports Bay's gym equipment
2017-11-10 18:47:49 -08:00
killer653
70e53b96bb
Polaris Sync
2017-11-10 11:37:41 -05:00
mistyLuminescence
9dad109f22
Putting wielded fire axes back now works correctly.
2017-11-06 10:27:55 +00: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
Anewbe
f1e939c397
Ports Bay's gym equipment
2017-11-04 18:53:18 -05: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