Commit Graph
7618 Commits
Author SHA1 Message Date
AnewbeandGitHub 3d15d309fd Merge pull request #4286 from Nalarac/Morgue
Allows Cyborgs to Use Morgue Trays
2017-11-18 12:02:52 -06:00
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
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
AnewbeandGitHub 98787bc2ef Merge pull request #4285 from mistyLuminescence/defibghost
Fixes ghost defib message bug
2017-11-17 20:12:57 -06: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
Andrew 4b422b71c0 Allows Cyborgs to Use Morgue Trays
+Adds attack_robot so cyborgs can use morgues
+Makes crematoriums a child of morgues
+Changes messages to use to_chat
2017-11-17 16:33:01 -06:00
Anewbe 9191bfe6f7 Adjusts original PR as per Staff request 2017-11-17 16:11:05 -06:00
AnewbeandGitHub 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
AnewbeandGitHub 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
BelsimaandGitHub 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
CyantimeandGitHub 1fc2d5da04 Allows constructed full window to smooth with mapped windows 2017-11-16 16:49:22 -05:00
mistyLuminescenceandAnewbe 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
VerkisterandGitHub fa48060644 darn capitalism 2017-11-14 09:43:52 +02:00
VerkisterandGitHub a5e3ddd948 items cannot forcemove? 2017-11-14 09:42:38 +02:00
VerkisterandGitHub ec413c1288 Update trash_vr.dm 2017-11-14 09:33:23 +02:00
Anewbe f5e831050b Decapitation now stops defibrillation 2017-11-14 01:15:29 -06: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
MechoidandGitHub 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
SabessandAnewbe 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
AnewbeandGitHub 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
SpadesandGitHub 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
elgeonmbandGitHub 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
AnewbeandGitHub 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
AnewbeandGitHub 516b7e7c2d Merge pull request #4206 from Cyantime/windos
Minor window fixes
2017-11-03 16:11:27 -05:00
AnewbeandGitHub 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
AnewbeandGitHub 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
AnewbeandGitHub 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