Commit Graph

7524 Commits

Author SHA1 Message Date
Spades
af3df2f511 Merge pull request #4110 from VOREStation/upstream-merge-5455
[MIRROR] Added Squid plushies of varying colours
2018-09-01 18:25:21 -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
Atermonera
c7caff2b3e Added Squid plushies of varying colours 2018-07-30 16:02:42 -04: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
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
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
Atermonera
5a448d9cd5 Merge pull request #5387 from Hawk-v3/master
Chaplain PDA Bug Fix & Atmos Dedupe
2018-07-04 01:14:06 -04:00
Aronai Sieyes
c5fc48af3c Merge pull request #3942 from Novacat/nova-heterochromia
Medical Tweaks
2018-07-02 00:42:29 -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
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
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
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
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
Atermonera
fe94038e7a Recharger refactor 2018-06-16 17:15:59 -04:00
Aronai Sieyes
c6fae09c1d Merge pull request #3888 from VOREStation/upstream-merge-5322
[MIRROR] Move planets to SSplanets
2018-06-16 13:57:09 -04:00
Aronai Sieyes
62b5386eb3 Merge pull request #3890 from VOREStation/upstream-merge-5337
[MIRROR] Folders props, and adds the laser prism, receptor, and sealed doors.
2018-06-16 10:51:29 -04:00
Aronai Sieyes
abd67bb983 Merge pull request #3889 from VOREStation/upstream-merge-5282
[MIRROR] Allows AIs to produce and control maint/construction/mining drones.
2018-06-16 10:51:20 -04:00
Arokha Sieyes
7c050dd35c Fix merge conflict, update virgo planet things 2018-06-16 10:43:45 -04:00
Mechoid
3c35b7d13a Folders props, and adds the laser prism, receptor, and sealed doors. (#5337)
* Re-bases props, and adds the laser prism.

* Ver 1 of Puzzle Lock and Doors

* Doors

* Fix door hiccup I made, modify Prism
2018-06-15 21:42:19 -04:00
Mechoid
9b00166de0 Allows AIs to produce and control maint/construction/mining drones. (#5282)
* Allows AIs to control maint/construction drones.

* Radio control online.

* Things Not Saving

* Drone control respects intellicores.

* Config control, AI drones are disableable if the AI isn't an antag.

* There's a diff so it must have saved. Right?

* No un/wrenching of the core.

* Complies to Replies.
2018-06-15 20:15:03 -04:00
Anewbe
98b3af60fa Move planets to SSplanets 2018-06-15 19:05:38 -04:00
Hawk_v3
15403798d8 Fixed missing backsprites
Forgot about those. I simply renamed the tanks as the old one was removed anyway. Apologies.
2018-06-15 22:49:38 +01:00
Hawk_v3
1db1280651 Merge remote-tracking branch 'upstream/master' 2018-06-15 22:46:14 +01:00
Aronai Sieyes
a162c86d51 Merge pull request #3855 from VOREStation/upstream-merge-5341
[MIRROR] Wires are under catwalks, fueltanks are over floor decals
2018-06-15 08:57:22 -04:00
Hawk_v3
9a3933517d Fix and Additions to Vox Tanks
Fixed Vox double tanks spawning in internal boxes.
Added indicator to Vox back tank, shifted sprite two pixels to reuse double tank indicators.
Added strip to Vox emergency tank to bring in line with back and double tanks.
2018-06-12 17:59:38 +01:00
Aronai Sieyes
97465264c3 Merge pull request #3840 from VOREStation/upstream-merge-5323
[MIRROR] Wallet money spawns as a bundle.
2018-06-11 06:08:31 -04:00
Ketrai
c351f1d3b0 Adds a fennec crate to cargo. (#3810)
* Adds a fennec crate.

Adds a fennec crate with a smaller chance of containing fennix.

* Adds a fennec crate

* Update hydroponics_vr.dm

* Fixes an error?

* Update largecrate_vr.dm

* Update largecrate_vr.dm
2018-06-11 06:06:49 -04:00
Atermonera
d768871055 Merge pull request #5341 from Anewbe/catwalks_again
Wires are under catwalks, fueltanks are over floor decals
2018-06-10 15:41:54 -04:00
Atermonera
190dd08fc4 Merge pull request #5323 from Anewbe/loadsamoney
Wallet money spawns as a bundle.
2018-06-06 19:08:31 -04:00
Anewbe
1800e1696f Merge pull request #5325 from elgeonmb/patch-7
Changes experimental welder fluff
2018-06-04 16:13:35 -04:00
Aronai Sieyes
b0f21a938b Merge pull request #3822 from VOREStation/upstream-merge-5305
[MIRROR] Prevent autosay() from creating/deleting AIs
2018-06-02 19:03:02 -04:00
Anewbe
b5eea2cffa Merge pull request #5320 from VOREStation/pol-hoods
Radiation closet hood fix
2018-06-02 16:23:08 -04:00
Anewbe
7528ac54fb Merge pull request #5305 from VOREStation/pol-autosay
Prevent autosay() from creating/deleting AIs
2018-06-02 12:47:27 -04:00