Commit Graph

1202 Commits

Author SHA1 Message Date
Unknown
de18c9321f Fixes Spirit for AI Overhaul
- Also fixes an error with Phi's ring
2019-02-20 12:26:58 -05:00
Poojawa
f05675e269 Resolves compile errors 2019-02-02 04:33:13 -06:00
Spades
c6c7d98a2d Merge branch 'master' into upstream-merge-5735 2019-01-14 11:20:55 -05:00
Cameron653
9dd973221d Resolves compile errors with the exception of map errors. 2019-01-12 21:09:29 -05:00
Spades
2c288ee62b Merge pull request #4624 from Verkister/patch-30
Fixes food not getting digested on itemweak.
2019-01-05 00:01:35 -05:00
Spades
68401ebe5e Merge pull request #4594 from Novacat/nova-survival
Ports synth overheating fixes
2019-01-04 23:58:14 -05:00
Verkister
d90593d689 Fixes food not getting digested on itemweak.
Well it would have been digesting if the belly had enough damage to oneshot it with the slow code. The problem was just that the itemweak mode was only applying one single hit on the food before excluding it from the loop for some reason.
2019-01-01 13:58:46 +02:00
Spades
00b3a05354 Merge pull request #4603 from Verkister/eww
Adds blacklist for item ingestion (borg and trashcanfolk)
2018-12-22 09:13:27 -05:00
Spades
770e5b088b Merge pull request #4574 from Verkister/contauring
Some taur contrast tweaks. (And dual color alraune)
2018-12-22 09:12:19 -05:00
Verkister
4c5cc9881a Adds blacklist for item ingestion (borg and trashcanfolk)
-Certain items previously blacklisted for digestion can still be eaten. (pAI, posibrain, AIcard, handtele beacon)
-Implemented for borg sleepers and trash eaters to prevent ABOOSE
2018-12-21 12:19:23 +02:00
Unknown
2739c2b837 Ports synth overheating fixes
This PR ports a fix from Chompstation regarding synths overheating in bellies. Hopefully it works here.
2018-12-18 14:03:04 -05:00
Mewchild
7477c696dc Updates Fluff Item 2018-12-14 13:21:49 -06:00
Verkister
4a2d895ced Code part for colorable alraune 2018-12-13 13:37:24 +02:00
Spades
37932732ca Merge pull request #4575 from Screemonster/stopfuckingwiththepomdamnit
makes the pompom uncontaminatable
2018-12-12 21:24:11 -05:00
Spades
531bd6a7eb Merge pull request #4562 from Verkister/patch-27
Disables PDA contamination.
2018-12-12 21:22:15 -05:00
Spades
d46b03c2ca Merge pull request #4542 from Verkister/yeehowlayer
Fixes some layering issues on taur/borg riding.
2018-12-12 21:18:52 -05:00
Screemonster
10138a49d3 makes the pompom uncontaminatable 2018-12-10 02:49:38 +00:00
Spades
5fe51f64ad Merge pull request #4507 from Verkister/patch-25
Fixes ingested organs giving way too much fat
2018-12-08 21:14:38 -05:00
Verkister
db0cfe8829 Disables PDA contamination.
No more messaging list meta.
2018-12-07 17:31:59 +02:00
Spades
4a27ffb35a Merge pull request #4515 from pontifexminimus2/dragor-HEYLOOKTHISMORONFORGOTHOWTODOSOURCETREEIBLAMEYOUARONAIFORMAKINGMEJUMPTHROUGHTHESEHOOPS
Renames guns with proper names for a more generic name and edits their desc.
2018-12-04 20:22:02 -05:00
Verkister
700a62dfee Fixes some layering issues on taur/borg riding.
-Proper layering is no longer ignored for every non-north direction.
-Also bumped borg riding offset upwards by couple pixels to better match the back height.
2018-12-04 17:13:48 +02:00
Spades
822a9eff0e Merge pull request #4500 from lm40/master
Adds Kenzie's hypospray
2018-12-01 12:29:53 -05:00
Spades
5f3485c48f Merge pull request #4492 from Verkister/yalldumphungry
Some trash eater tweaks and additions.
2018-11-26 09:08:00 -05:00
Spades
0468b18e7a Merge pull request #4484 from VOREStation/permits-updates
Updates permits, adds Ace's pistol
2018-11-26 09:03:38 -05:00
Spades
c8b50f7a67 Merge pull request #4475 from Novacat/nova-weapons
Weapons Tweaks and Sprites
2018-11-26 09:02:55 -05:00
Spades
cca310a2d6 Merge pull request #4351 from Screemonster/nogurgletheblurble
Makes promethean cores indigestible
2018-11-26 08:59:28 -05:00
Spades
a542e23e4e dragor no 2018-11-25 20:32:40 -05:00
Unknown
19efdc84dc Improved Holdout Description 2018-11-25 17:33:04 -05:00
pontifexminimus2
5913203c0f Due to request of Ace. 2018-11-25 17:22:35 +01:00
pontifexminimus2
4c46defd4f Renaming Protector too. 2018-11-25 16:50:24 +01:00
pontifexminimus2
784e48b895 Holy shit I hate this. 2018-11-25 16:45:37 +01:00
Verkister
86ee636b19 Fixes ingested organs giving way too much fat
Oh god I just realized the slow item digestion code made hardvored bodyparts have the calorie content of nuclear fuel.
2018-11-22 17:27:55 +02:00
Verkister
9d9865a27a Makes owned PDAs edible only if the owner is watching.
-Prevents folks from just going ham on random lost&founds or SSD loot.
2018-11-14 13:01:56 +02:00
Verkister
2330c21461 Stronger uplink abuse prevention.
-Now also notifies admins whenever someone attempts to commit trait abuse to find or hide uplinks.
2018-11-13 12:30:39 +02:00
lm40
d11c036733 fixed icon 2018-11-12 20:02:40 -05:00
lm40
79f92e4f20 added kenzie's hypospray 2018-11-12 19:33:34 -05:00
Verkister
c1ac36e0dc Little anti-sumggling tweaks.
-Excludes all uplink enabled items from ingestion with a warning message.
-Excludes boots containing items (knives and such) from ingestion with a warning message.
-Removes a redundant PDA contamination blurb.
-Doubles the time delay it takes to swallow an owned PDA after initiating the action.
2018-11-12 13:25:55 +02:00
Verkister
a7347765df Reverts contamination disabling all PDA functionality. 2018-11-11 13:55:12 +02:00
Verkister
f0cd597b49 Some trash eater tweaks and additions.
-Adds a bunch of new low exploitability stuff to the garbo snack menu for suggested scene/fun shenanigans. (small non-storage gear (hat/mask/glasses/gloves/shoes), PDA, headset, organs, more toys, bones, broken emags, busted circuitry, lighters, bottles, lifecrystal cases)
-The PDAs give a warning and a delay time if owned, and come with an additional confirmation popup if they also contain an ID.

-Also fixed a bug that would cause "partially-digested" PDAs to forget the existence their IDs and thus make them unrecoverable until the PDA is deleted. (introduced by the gradual gurgles update)
2018-11-11 13:47:05 +02:00
Spades
0f2a17b3bc Fixes error, also slightly alphabetizes a file
custom_boxes_vr.dm
2018-11-09 20:16:30 -05:00
Spades
129a289052 Updates permits, adds Ace's pistol
- Fixed some permit stuff.
- Removed expired permits and associated items.
- Added Ace's pistol plus a spare mag.
- Locked items to brig access, covering warden, HoS, and Captain, but
not roles like HoP. I think.
2018-11-09 20:06:01 -05:00
Unknown
97c5771625 8 Shots Phaser, 4 shots holdout
- Also halves power usage for stun options on both the martin and the holdout
2018-11-05 19:12:45 -05:00
Arokha Sieyes
d50e2d9deb Edit mapped in HoS armor
It was edited on the map to have pretty incredible armor values, better than SWAT armor, even. Things like this shouldn't be edited in the dmm files. Hard to have oversight on things like that.
Moved the armor values to the code and out of the map, and adjusted them to be more reasonable after discussing with other admins.
2018-11-04 22:51:32 -05:00
Unknown
b974aa763a Renames normal to lethal on phasers 2018-11-02 15:59:13 -04:00
Unknown
6d928db859 Sprite swap for low power/stun
Red = High Power, Blue = Low Power, Yellow = Stun
2018-11-02 12:54:51 -04:00
Unknown
f67de7bc84 Weapons Balance and Sprites
- AEG now has 10 lethal shots
- Phase weapons bonus damage to animals removed
- Phase weapons now do real damage
- Charge cost bug fixed with phaser
- Overhauled sprite for holdout phaser
- Added Phaser Carbine, right now just a reskinned phaser
- One phaser carbine added to the Pathfinder's locker
2018-11-02 12:31:22 -04:00
Keekenox
1c25ffe12a Switched off unit test 11 because the build had to go out now and there was no time to fix it properly.
Wingy bois
2018-10-27 16:07:06 -04:00
Spades
dbec51db41 Merge pull request #4433 from Verkister/infixfix
Fixes examine for mobs that relied on atom proc specific features.
2018-10-20 08:58:05 -04:00
Spades
c9a5499a70 Merge pull request #4426 from Heroman3003/awoo-refactor
Replaces awoo with wolfgirl
2018-10-20 08:56:14 -04:00
Verkister
81fa928d4c Fixes examine for mobs that relied on atom proc features.
-Mainly affected borgs and pAIs. Maybe others idk.
2018-10-20 14:47:39 +03:00