Commit Graph

29400 Commits

Author SHA1 Message Date
Spades
16b37dfc19 Merge pull request #2506 from VOREStation/Aces-Tweaks
Some various map tweaks, and also carp nerf
2017-11-20 18:57:48 -05:00
Cameron653
bd8d2bbf00 Gives Tas coat same allowed items as HoS oat 2017-11-20 16:04:59 -05:00
Spades
db2722a401 Some various map tweaks, and also carp nerf
- Space carp now only spawn on the bottom level of the asteroid. Changed
the message to reflect this.
- A few minor map tweaks and fixes. Mostly asthetic. Just threw some
dirt around.
- Added Gaslamps to the maps, which will now wander around uncaringly
until antagonized.
2017-11-20 15:35:32 -05:00
Cameron653
1de5a6c132 Update vorepanel_vr.dm 2017-11-19 11:25:34 -05:00
Spades
28c33b6e10 Fixes
- Added area for the range.
- Added a new route into that big maint tunnel, but I won't explain how
to get there. You can figure it out.
2017-11-18 16:10:56 -05:00
Cameron653
cf472937bf Merge pull request #2498 from Cameron653/DROPNOM_QUICK_FIX
Fixes dropnom permastuns. Prevents dropnom double damage.
2017-11-18 12:50:10 -05:00
Spades
13113791bd Merge pull request #2494 from VOREStation/Cameron653-patch-2
Fluff Fixes
2017-11-18 12:20:24 -05:00
Spades
108157a3c9 Merge pull request #2499 from VOREStation/command-guide
Fixes Chain of Command guide book
2017-11-18 12:20:15 -05:00
killer653
9ead1295e1 Github didn't push this 2017-11-18 11:10:53 -05: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
Verkister
dade02115d Update atoms_movable.dm 2017-11-18 17:41:22 +02:00
Verkister
bb2deea01d Fixes my lossed updoots. 2017-11-18 17:39:00 +02:00
killer653
afa7b21dc9 Fixes permastuns. Prevents doubledamage 2017-11-18 10:37:58 -05:00
Verkister
5e61cf9265 PIXEL_SCALE definition unconflict.
-Ours is defined by pref in our size code.
2017-11-18 10:17:33 +02:00
Cameron653
00ab8f752b Also fixes Ivy's fluff ID 2017-11-18 00:16:12 -05:00
Cameron653
5c4aac8ca7 Adds egg description 2017-11-17 21:01:46 -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
Neerti
264372ff1a Sanitizes Circuit Inputs 2017-11-17 18:38:48 -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
Mechoid
5074b5c498 Merge pull request #4210 from Anewbe/seven-point-ling
Adjusts Changelings for a base of 7 points
2017-11-17 14:02:01 -08:00
Anewbe
d1d5ec3887 Merge pull request #4271 from Mechoid/Nano-Pasta
Nanopaste Tweaks
2017-11-17 15:59:14 -06:00
Anewbe
b5f7494740 Merge pull request #4282 from Belsima/tagemandbagem
Bodybag standardization & grammar.
2017-11-17 15:37:00 -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
Spades
a412c18614 Merge pull request #2469 from Verkister/gimmicktraits
Adds 2 gimmick traits and borgo feeding.
2017-11-16 22:36:46 -05:00
Spades
bc51b77ed6 Merge pull request #2487 from Ketrai/patch-8
Makes it solargrub larva produce solargrub meat.
2017-11-16 22:36:22 -05:00
Spades
d80abeb939 Merge pull request #2475 from VOREStation/luger-nerf
Rebalanced the Energy Luger
2017-11-16 22:35:39 -05:00
Spades
0dbc5f92f9 Merge pull request #2490 from VOREStation/aro-deadgrab
Stops runtime when ghosts examine people
2017-11-16 22:35:01 -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
Arokha Sieyes
8e55f94e97 Merge pull request #2484 from Verkister/gogliberation
Unrestricts my fluff goggles for general loadout use.
2017-11-16 15:31:48 -05:00
Arokha Sieyes
bd5e5cf08b Merge pull request #2483 from VOREStation/Auream-Imperium-fix
Update organizations_vr.dm
2017-11-16 15:30:33 -05:00
Arokha Sieyes
52e6096be6 Stops runtime when ghosts examine people
Defines this proc so that it will work on every mob, then overrides it on living to work like normal. I'd use INFINITE but I have no idea what would happen if it tried to do math on it.
2017-11-16 15:24:18 -05:00
Ketrai
52d004c0fd Makes it solargrub larva produce solargrub meat.
They just drop red meat right now, silly.
2017-11-16 20:35:01 +01:00
elgeonmb
a7f8a8270e changes max shield radius
as requested by Mazian on the forums.
2017-11-16 02:17:06 -08:00
Anewbe
1d9adcb285 Merge pull request #4267 from Neerti/11/14/2017_icon_scaling
Makes Icon Scaling Great
2017-11-16 01:52:05 -06:00
Verkister
7c7794f74f Unrestricts my fluff goggles for general loadout use.
-Opie's orange goggles and Cameron's aesthetic science goggles.
-The orange goggles can also be worn on ear slot in order to have their up state above the hair layer.
2017-11-16 09:31:27 +02:00
Spades
64da022bd6 Merge pull request #2473 from Cameron653/SILVERTALISMAN_CUSTOM_IMPLANT
Silvertalisman custom implant
2017-11-15 19:46:10 -05:00
Spades
c501e16e05 Update organizations_vr.dm
Auream Imperium not Imperium Auream.
2017-11-15 19:45:25 -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
Anewbe
ff9a191135 Merge pull request #4265 from Atermonera/conscious_strip
MouseDrop checks incapacitated() before giving inventory access
2017-11-15 12:36:16 -06:00
Spades
55837653b2 Merge pull request #2470 from Verkister/wrecc
Dogborg wreck and rest icons now work properly!
2017-11-15 11:01:21 -05: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
Spades
904899fcde Merge pull request #2477 from Verkister/plowthatnerd
Adds an inconveniently evil new negative trait.
2017-11-15 10:48:55 -05:00
Verkister
fb7ebab196 Update living.dm 2017-11-15 16:39:33 +02:00
Verkister
b4c707e591 Update living.dm 2017-11-15 07:56:01 +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