Commit Graph

7631 Commits

Author SHA1 Message Date
Hawk_v3
fcc2f9aa79 Merge remote-tracking branch 'server/master' 2018-08-21 21:01:32 +01:00
Repede
ba3584c965 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	config/custom_items.txt
#	config/jobwhitelist.txt
2018-08-17 19:13:15 -04:00
Spades
16f5ea792b Merge pull request #4091 from VOREStation/upstream-merge-5444
[MIRROR] Adds the Gigaphone, a suped-up Megaphone.
2018-08-17 16:13:10 -04:00
Spades
c1c7af946b Merge pull request #4084 from VOREStation/upstream-merge-5441
[MIRROR] Fixes the PDA Halogen Scanner's tendency to be number one.
2018-08-17 16:12:24 -04:00
Hawk_v3
ca1b44cf5e Fix for latest Beta
Allows it to compile, no actual changes.
2018-08-07 14:16:01 +01:00
Anewbe
6c6c5a2255 Merge pull request #5444 from Mechoid/Gigglephone
Adds the Gigaphone, a suped-up Megaphone.
2018-07-27 19:28:36 -04:00
Anewbe
975b5a7bf2 Merge pull request #5441 from Mechoid/Halogenscannerreeee
Fixes the PDA Halogen Scanner's tendency to be number one.
2018-07-26 15:14:18 -04:00
Anewbe
0abdfff854 Merge pull request #5439 from Neerti/layer_fixes
Fixes layering issues for a few things
2018-07-25 17:27:05 -04:00
Hawk_v3
22f600c51d Merge remote-tracking branch 'upstream/master' 2018-07-21 22:56:04 +01:00
Aronai Sieyes
939642a564 Merge pull request #4037 from VOREStation/upstream-merge-5386
[MIRROR] Add a procedure for repairing limbs via surgery.
2018-07-21 14:45:35 -04:00
Aronai Sieyes
1e2d27e8c4 Merge pull request #4035 from VOREStation/upstream-merge-5409
[MIRROR] Adds roofing tiles
2018-07-21 14:44:09 -04:00
Aronai Sieyes
1369c45f13 Merge pull request #4034 from VOREStation/upstream-merge-5317
[MIRROR] Dead Ringer + PoI
2018-07-21 14:43:59 -04:00
Arokha Sieyes
46f7b22838 Fix virgo implant stuff 2018-07-21 14:21:17 -04:00
Unknown
5b5d20a791 Correct minor error in the BSG gunbox
We no longer use the P90 as a weapon choice, and is instead a WT550, Correcting the dialog box to reflect this. as it still referenced the P90.
2018-07-18 12:30:06 +01:00
Repede
1b5cb2bafa Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 2018-07-17 20:30:33 -04:00
Anewbe
e2da5d687b Merge pull request #5386 from Mechoid/End_The_Tyranny_Of_Chemistry
Add a procedure for repairing limbs via surgery.
2018-07-14 15:57:52 -04:00
Atermonera
1216f97663 Adds roofing tiles (#5409)
* Adds roofing tiles
They're used to place plating overhead without going up a floor
And to remove weather effects

Changing a turf will correctly inherit the old outdoors variable, so that roofing tiles can check it when deciding whether to roof an area

* Adds roofing tiles
They're used to place plating overhead without going up a floor
And to remove weather effects

Changing a turf will correctly inherit the old outdoors variable, so that roofing tiles can check it when deciding whether to roof an area
2018-07-14 15:24:33 -04:00
drexample
090ba940a8 Dead Ringer + PoI (#5317)
* fixed photos

* Revert "fixed photos"

What was I thinking?

* Added stopwatch, deadringer, cultist mob and PoIs for them.
Made simplemobs ignore invisible people.

* Organ deletion fix.

* Test

* projectile fix + time adjustment

* initialize crate change

* Changed cultists into semi-transparent ghost people

* Removed Stopwatch for a separate PR

* Removed stopwatch trace

* removed cultists from dme

* Removed Stopwatch PoI

* Clean up unused files / stopwatch addition

* Replaced sounds with stock ones from
freesound.org
Removed icon modifications
Grammar fix
Removed unused sound files

* PoI tweaked

* Removed unused area
2018-07-14 15:16:04 -04:00
Anewbe
edf92c57f9 Language and Larynx Additions 2018-07-14 00:14:49 -04:00
Anewbe
a3835d42f4 Merge pull request #5397 from Atermonera/boilerplate_list_fix
Global list boilerplates cause the target path to actually add to the list
2018-07-09 22:52:12 -04:00
Repede
123050bcd0 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self
# Conflicts:
#	code/game/jobs/job/civilian_chaplain.dm
#	code/modules/mob/language/station_vr.dm
2018-07-08 11:38:06 -04:00
Atermonera
5a448d9cd5 Merge pull request #5387 from Hawk-v3/master
Chaplain PDA Bug Fix & Atmos Dedupe
2018-07-04 01:14:06 -04:00
Repede
cbea7f7c1a Nerfs blueshields more, fixes for jackhammer drums. 2018-07-02 11:21:37 -04:00
Aronai Sieyes
c5fc48af3c Merge pull request #3942 from Novacat/nova-heterochromia
Medical Tweaks
2018-07-02 00:42:29 -04:00
Hawk_v3
8aa6aa85bc Merge remote-tracking branch 'upstream/master' 2018-06-29 22:32:22 +01:00
Hawk_v3
9a38e88b9f Blueshield updates. New shotgun.
Semiauto revolver shotgun for Blueshield and Warden. Sprites are placeholder.

Blueshield spawn gear boxes for weapon choice now.
2018-06-29 15:03:01 +01:00
Repede
d4bb48b2f6 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self
# Resolved Conflicts:
#	code/game/machinery/cloning.dm
#	config/custom_items.txt
#	icons/mob/vore/taurs_vr.dmi
#	maps/tether/tether-05-station1.dmm
#	maps/tether/tether-06-station2.dmm
2018-06-29 09:58:53 -04:00
Spades
04ad5eadab Merge pull request #3939 from CameronWoof/first-aid-kits
Updates first aid kit sprites
2018-06-29 09:12:50 -04:00
Repede
9155e62b5c Blueshield tweaks and map_template.dm typo fix 2018-06-28 00:23:41 -04:00
Unknown
3f63e5933a Keep healing same between bruise/burn 2018-06-27 16:54:15 -04:00
Unknown
729ed3177b Suggested Tweaks 2018-06-27 16:51:20 -04:00
Unknown
51142c08d2 Gauze Tweak 2018-06-27 15:44:29 -04:00
Unknown
528f231f41 Medical Tweaks
- Ointment now treats 3 burn damage per application
- Advanced Trauma Kits treat 6 damage per application, and have 20 uses
- Advanced Burn Kits treat 12 damage per application
- Medical Rescue Suit injector now has 20 units per chem, and uses Inaprovaline, Dylovene, Paracematol, and Dexalin
- Kelotane effectiveness reduced from 6 damage per tick to 4 damage per tick
- Dermaline effectiveness reduced from 12 damage per tick, to 8 damage per tick
- Dexalin metabolizes at 20% of the rate of Dexalin Plus, stats adjusted accordingly (Natje's suggestion)
- Dexalin is now twice as effective (still pales in comparison to Dex Plus)
- Reduced brain healing of Alkysine from 30 to 8
- Vermicetol now works like super tricordazine, healing all damage types at a moderate rate, while metabolizing slowly. Overdose threshold increased from 10u to 15u.
- All pre-filled syringes start capped.
- There is now a 20-second grace period for infection to start ticking up (Note: Using syringes on multiple people renders grace period null and void)
2018-06-27 15:19:52 -04:00
Cameron!
f44fe108a1 in which we discover the importance of proper quotation
and apologize profusely to Travis for the inconvenience
2018-06-27 11:29:23 -04:00
Cameron!
66c8325e48 properly comments the clotting kit change 2018-06-27 11:09:44 -04:00
Cameron!
b44d87b744 Gives clotting kits a unique sprite
Adds a unique sprite for clotting kits
2018-06-27 11:08:15 -04:00
Cameron!
89dcfa7c52 Updates first aid kit sprites
So pretty.
2018-06-27 10:50:56 -04:00
Michael Gosselin
fa6558ea55 Merge remote-tracking branch 'refs/remotes/Repede/master' 2018-06-26 20:53:47 -04:00
Michael Gosselin
b415065e3f R-UST Guide fix
R-UST guide now tells you to turn the field on before moving onto the
gyrotrons.
2018-06-26 20:52:15 -04:00
Hawk_v3
d4e5a3938b Fix for Atmos Tech
Starting with two T-rays
2018-06-26 21:06:56 +01:00
Verkister
d1ab58b7f8 Little tweaks etc.
-Renamed heckboy paths.
-Fixed a sprite inconsistency.
-New latin names.
-Feral red changed to cult faction.
-Changed red tame chance to 20%.
-Made "experimental environment" otie crate have a 20% chance to contain a friendly red instead of phoron.
2018-06-25 11:33:19 +03:00
Dwaggy
0dc547f976 Update:
Blueshields:
 - Added blueshield headset
   -Has access to Command and Security channels
    -Has its own Encryption key set for blue-shields for this, this stops any accusations of keys been stolen from Sec.
Weapons:
 - This affects BSG and HoS, but the case the NSFW weapon comes in (HoS version), Will have two ammo mags, as opposed to the previous one.
2018-06-24 17:44:44 +01:00
Verkister
49e7cb1bcd Adds "redspace" oties.
-Stats-wise identical to phoron mutants for now.
-Can appear in dangerous pred crate.
-Commissioned for shenanigans etc.
2018-06-24 16:34:24 +03:00
Repede
8ea0e21fc6 Merge branch 'master' of https://github.com/Repede/YawnWiderStation into self
# Conflicts:
#	icons/mob/robots.dmi
2018-06-23 17:58:41 -04:00
Repede
2b0aff0b6d Merge branch 'master' into self
# Conflicts:
#	code/game/objects/items/weapons/tanks/tank_types_vr.dm
#	icons/obj/tank_vr.dmi
2018-06-23 17:56:05 -04:00
Repede
2b21dbfd99 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self
# Conflicts:
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	maps/tether/tether-05-station1.dmm
#	maps/tether/tether-06-station2.dmm
2018-06-23 17:53:13 -04:00
Repede
509311613b Merge pull request #127 from Repede/self
Dabs on NIFs, also adds NSFW kit to blueshield locker until we make t…
2018-06-23 12:39:12 -04:00
Repede
4145525a1a Dabs on NIFs, also adds NSFW kit to blueshield locker until we make the custom gun kit 2018-06-23 12:38:20 -04:00
Sharkmare
2cbfb05a4a Making Circuit debugger fit in toolbelt
Because both the multitool and the Circuit wirer fit in already.
2018-06-20 03:39:09 +02:00
Michael Gosselin
e24d3fc670 Merge remote-tracking branch 'refs/remotes/Repede/master' 2018-06-17 19:23:58 -04:00