Commit Graph

32483 Commits

Author SHA1 Message Date
Neerti
5a221f37a4 Merge pull request #5398 from Mechoid/CablePrints
Cutting cables will now transfer fingerprints.
2018-07-09 11:39:31 -04:00
Anewbe
f0a7b2466e Merge pull request #5390 from VOREStation/pol-planetstartup
Fixes some planets controller runtimes
2018-07-05 15:50:15 -04:00
Aronai Sieyes
a8b9fa86df Merge pull request #3966 from Verkister/killborg
Fixes sleeperbellies not ejecting contents on borg death.
2018-07-04 19:37:39 -04:00
Anewbe
af08909d49 Merge pull request #5389 from VOREStation/pol-hypo
Fix hypospray exploit
2018-07-04 11:50:55 -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
05989b6aa9 Merge pull request #3971 from VOREStation/upstream-merge-5385
[MIRROR] Fix handheld Cameras
2018-07-03 18:52:58 -04:00
Layne
7a79fd407c Changelings Now Succ Traits (#5376)
Changelings store traits from their victims
2018-07-03 17:10:27 -04:00
Aronai Sieyes
3b306e87f0 Merge pull request #3968 from VOREStation/upstream-merge-5375
[MIRROR] Adds non-head of staff department cloaks
2018-07-03 15:43:19 -04:00
Aronai Sieyes
c4445e415d Merge pull request #3970 from Novacat/nova-heterochromia
Fixes USDF Armor Sprites
2018-07-03 15:41:38 -04:00
Aronai Sieyes
f857592fa0 Basically undo changes 2018-07-03 15:39:58 -04:00
Unknown
b80b736e16 Fixes Imperial Laser too 2018-07-03 10:26:57 -04:00
Anewbe
2be38d8d90 Fix handheld Cameras 2018-07-03 01:23:04 -04:00
Unknown
1dc914063b Fixes USDF Sprites
Fixes #3967 for Ace
(Unfortunately I have no idea how to fix the imperial weapon sound)
2018-07-03 01:17:11 -04:00
Spades
1528dd37fc Merge pull request #3956 from Jakksergal/master
Security Overhaul
2018-07-02 20:49:11 -04:00
Anewbe
0c25bf04a0 Merge pull request #5375 from Mewchild/MC-Cloaks
Adds non-head of staff department cloaks
2018-07-02 20:32:14 -04:00
Verkister
9f36a01985 Fixes sleeperbellies not ejecting contents on borg death.
-Wow it sure took a while before we found out what was forgotten during the original citadel port.
2018-07-02 13:28:59 +03:00
Jakksergal
909c3fe16d Fixes serious issues. Adds new floor decals. Fixes wires/pipes/lights
Fixes cell doors not working.
Adds lights to maintenance.
Patches missing pipes in riot control.
Adds a console to toggle N2O injection from observation. Note this is a hacky aproach, the UI doesn't display the right console name.
2018-07-02 00:55:45 -07:00
Atermonera
308c4b64e0 Renames Taj Sign Language 2018-07-02 00:49:17 -04:00
Aronai Sieyes
bb895947d9 Merge pull request #3950 from VOREStation/upstream-merge-5369
[MIRROR] Only slimes may squish.
2018-07-02 00:43:26 -04:00
Aronai Sieyes
c5fc48af3c Merge pull request #3942 from Novacat/nova-heterochromia
Medical Tweaks
2018-07-02 00:42:29 -04:00
Aronai Sieyes
2e0e39b627 Merge pull request #3949 from VOREStation/upstream-merge-5361
[MIRROR] Ports Siik'Tajr from Baystation
2018-07-02 00:36:20 -04:00
Aronai Sieyes
2827b498cc Merge pull request #3961 from VOREStation/upstream-merge-5380
[MIRROR] Dungeon walls no longer take damage.
2018-07-02 00:32:51 -04:00
Aronai Sieyes
9a56255686 Merge pull request #3960 from VOREStation/upstream-merge-5379
[MIRROR] Fixes an infinite drowsyness bug
2018-07-02 00:32:35 -04:00
Aronai Sieyes
14b0c1ce67 Merge pull request #3954 from VOREStation/upstream-merge-5378
[MIRROR] Apportation checks range again
2018-07-02 00:32:19 -04:00
Aronai Sieyes
b23aafca9c Comment out change 2018-07-02 00:30:59 -04:00
Arokha Sieyes
ae755b776c Remove the custom Virgo version of siiktajr 2018-07-02 00:21:41 -04:00
Atermonera
f1bb6234f5 Merge pull request #5380 from Anewbe/hopefully_invincible_walls
Dungeon walls no longer take damage.
2018-07-01 17:57:59 -04:00
Atermonera
9b237d0d5c Merge pull request #5379 from Anewbe/drowsy
Fixes an infinite drowsyness bug
2018-07-01 17:56:46 -04:00
Atermonera
9d0d0528ad Merge pull request #5378 from Anewbe/camera_thieves_reeeeeeeeeeee
Apportation checks range again
2018-06-30 18:47:28 -04:00
Unknown
14d64a5570 Duplicate PR revert and minor bugfix
- Reverts Virgo Siik'Tajr, since Polaris decided to implement it upstream
- Fixes a bug that caused the Pathfinder's locker script to instead trigger on explorer lockers
2018-06-29 16:25:20 -04:00
Layne
a12778d773 Only slimes may squish. (#5369)
* Clandestine (Original Commit)

* Revert "Clandestine (Original Commit)"

This reverts commit cdb1abb47b3720e9160a4942a06f1b9036db2c27.

* Squish on my slime

* Squish on my slime
2018-06-29 15:56:20 -04:00
Anewbe
8b813107c1 Merge pull request #5361 from Novacat/spriteadd
Ports Siik'Tajr from Baystation
2018-06-29 15:49:56 -04: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
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