Commit Graph

32627 Commits

Author SHA1 Message Date
Anewbe
9b54e62a89 Merge pull request #5361 from Novacat/spriteadd
Ports Siik'Tajr from Baystation
2018-06-29 14:49:16 -05:00
Aronai Sieyes
8e870dc58a Merge pull request #3946 from Verkister/accerrorize
Adds a bunch of new sprite accessories.
2018-06-29 09:41:33 -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
Verkister
82dd96a141 Adds a bunch of new sprite accessories.
-Mainly ports from old Citadel assets.
-Markings: Otter face, Otter nose, Deer face, Cloven hooves, Shepherd snout, Shepherd back.
-Head accessories: Small bear ears, Deer ears, Small antlers, Deer ears with small antlers, Caprine horns, Drake frills.
-Also fixed a Polaris blooper from our tajaran sprite file. (The legs were facing in different directions in side views.)
2018-06-29 15:32:30 +03:00
Aronai Sieyes
ed8767ce72 Merge pull request #3925 from Verkister/spicyboye
Adds "redspace" oties.
2018-06-28 14:34:49 -04:00
Aronai Sieyes
a082cd2a34 Merge pull request #3935 from VOREStation/upstream-merge-5374
[MIRROR] Gloves cannot be put over Commwatches.
2018-06-28 14:33:55 -04:00
Unknown
d57b85c597 Vermicetol is now T2 Brute chem 2018-06-28 14:25:20 -04:00
Unknown
1af6dbf376 Bicard Nerf 2018-06-27 22:49: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
b46a15da4e Further Dex Tweaks 2018-06-27 15:36:09 -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
Mewchild
a8600832d8 Adds non-head of staff department cloaks 2018-06-27 10:24:31 -05: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
Aronai Sieyes
e74f784791 Merge pull request #3937 from Mewchild/MC-Permits
Permit Cleaning
2018-06-27 11:07:02 -04:00
Cameron!
89dcfa7c52 Updates first aid kit sprites
So pretty.
2018-06-27 10:50:56 -04:00
Mewchild
3164a98831 Shut up travis. Commenting Error 2018-06-26 02:43:43 -05:00
Mewchild
26753c4330 Seb still has a permit. Misread. 2018-06-26 00:45:03 -05:00
Mewchild
f4ce27804c Comments out a bunch of expired permits and associated weapons 2018-06-25 23:52:25 -05:00
Anewbe
13567cb681 Merge pull request #5373 from VOREStation/pol-podfix
Fix invalid logic in clonepod beaker function
2018-06-25 20:39:41 -04:00
Anewbe
ef482a0d5d Merge pull request #5374 from Mechoid/Commwatchbug
Gloves cannot be put over Commwatches.
2018-06-25 20:39:29 -04:00
Anewbe
3994e0e9ba Merge pull request #5374 from Mechoid/Commwatchbug
Gloves cannot be put over Commwatches.
2018-06-25 19:39:16 -05: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
Mechoid
0555c99872 Commwatches aren't rings. Please donut deloot. 2018-06-24 19:32:53 -07:00
Arokha Sieyes
ed726ecfbc Biomass change compensation 2018-06-24 15:25:36 -04:00
Arokha Sieyes
e6a7b744f0 Fix invalid logic in clonepod beaker function 2018-06-24 15:19:49 -04: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
Aronai Sieyes
859b06497b Merge pull request #3874 from Novacat/nova-pathfinder
Ports Siik'Tajr from Baystation
2018-06-24 01:02:52 -04:00
Aronai Sieyes
47dac5ae08 Merge pull request #3895 from Verkister/chompybois
Gives simplemobs and dogborgs brutal predation
2018-06-24 00:59:55 -04:00
Aronai Sieyes
19b20c6e84 Merge pull request #3907 from Wickedtemp/patch-2
Slight cloning mlem
2018-06-24 00:58:33 -04:00
Aronai Sieyes
9a9541d848 Merge pull request #3904 from Sharkmare/patch-2
Making Circuit debugger fit in toolbelt
2018-06-24 00:58:23 -04:00
Aronai Sieyes
2434ed0b44 Merge pull request #3903 from Sharkmare/patch-1
Adding the Bioadaptive NIF to designs_vr.dm
2018-06-24 00:58:14 -04:00
Aronai Sieyes
10fafd79a2 Merge pull request #3900 from VOREStation/rust-voresettings
Use rust-g to optimize saving of vore persistent settings if available.
2018-06-24 00:58:05 -04:00
Aronai Sieyes
42f6ffef04 Merge pull request #3913 from VOREStation/upstream-merge-5365
[MIRROR] Alien Cable Coil Fix
2018-06-23 22:01:36 -04:00
Cameron653
ef2c62c63a Alien Cable Coil Fix (#5365)
* Prevents the infinite cable coil alien tool from making more infinite cable coil tools.

* Prevents you from going over the 30 cap.

* Tochat
2018-06-21 03:26:14 -04:00
Cameron653
2e987ab900 Alien Cable Coil Fix (#5365)
* Prevents the infinite cable coil alien tool from making more infinite cable coil tools.

* Prevents you from going over the 30 cap.

* Tochat
2018-06-21 00:26:02 -07:00
Anewbe
71fe7798f6 Ports Fulton Balloons (#5354) 2018-06-21 00:20:11 -07:00
Mechoid
382ce457ca Fix AI-drone runtimes. Get angry at commits. (#5366)
* 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.

* Fix some AI-drone runtimes.
2018-06-21 03:19:27 -04:00
Mechoid
ff827ce831 Fix AI-drone runtimes. Get angry at commits. (#5366)
* 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.

* Fix some AI-drone runtimes.
2018-06-21 00:18:41 -07:00
Wickedtemp
24f31e6ed0 Secondary Clonemlem
Because I left out //MLEMstation Edit
2018-06-20 13:08:11 -05:00
Wickedtemp
00904e6c98 Slight cloning mlem
Halves biomass required for printing a body. 60, to 30.
2018-06-20 12:53:17 -05:00
Aronai Sieyes
65ddf25028 Merge pull request #3892 from VOREStation/upstream-merge-5355
[MIRROR] Bioprinters and Cloners now use Biomass reagent, maps in a Bioprinter
2018-06-20 13:40:07 -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
Sharkmare
5af4c44e78 Adding the Bioadaptive NIF to designs_vr.dm
Added the Bioadaptive NIF to the list of Designs using the sort code of the NIF repair tool and gave the NIF repair tool a new sortcode.
2018-06-19 14:59:23 +02:00
Verkister
472672a834 reset module thing 2018-06-18 18:17:58 +03:00
Aronai Sieyes
016166672a Merge pull request #3894 from VOREStation/upstream-merge-5356
[MIRROR] Recharger refactor
2018-06-17 19:24:16 -04:00
Leshana
c377a4a6c0 Use rust-g to optimize saving of vore persistent settings if available. 2018-06-17 19:11:17 -04:00