Commit Graph

6513 Commits

Author SHA1 Message Date
Cyantime
3f48e8ae07 Attempted wilderness performance increase (#1841)
* Attempted wilderness performance increase

* might as well

* Edit comments

* Moves alien change out of polaris file
2017-07-19 15:30:22 -04:00
Cameron653
97e851f2e4 Adds in body snatcher device (#1822)
* Adds in body snatcher

* Modifies method the bodysnatcher works

* Fixes merge & compile error

* Update trash_pile.dm

* Update trash_pile.dm

* Gets transfer_to to work
2017-07-19 15:26:34 -04:00
Spades
5672fbe648 Merge pull request #1839 from VOREStation/tether-changes
Tether changes
2017-07-08 23:13:22 -04:00
Spades
619206f651 Update trash_pile.dm
oops
2017-07-08 14:30:34 -04:00
Spades
929e872ee3 Tether changes
- Reduced trash piles by probably half. There shouldn't be more than one
trash pile in any room.
- Replaced steel beds with comfy beds everywhere.
- Removed syndie ID from trash pile, because there's absolutely no way
to detect it by Security, making it OP.
- Added sizegun to trash piles. Is technically not contraband, so enjoy.
2017-07-08 11:54:49 -04:00
Spades
6d16544762 Update flora.dm 2017-07-08 11:05:39 -04:00
Spades
190d532f05 One last thing 2017-07-08 01:28:31 -04:00
Spades
b5f86eece2 Merge remote-tracking branch 'refs/remotes/origin/master' into wilderness-additions
# Conflicts:
#	code/modules/mob/living/simple_animal/vore/otie.dm
2017-07-08 01:26:47 -04:00
Spades
19a6895e3c Fixes 2017-07-08 01:24:55 -04:00
Spades
c130fb913e Merge pull request #1834 from VOREStation/wilderness-additions
forgot this
2017-07-07 23:41:14 -04:00
Spades
e19bcef832 forgot this 2017-07-07 23:39:59 -04:00
Verkister
6a633f6c51 More otie stuff.
-Took out the minimum oxygen requirement from space oties. They all died outside as oxygen was not one of the gases there.
-Moved guard otie to security category in cargo.
-Moved the collared otie from pred crate to its own crate. Bare one is still in the pred crate chances.
-
2017-07-07 17:07:15 +03:00
Spades
d3b1bba301 Merge pull request #1823 from VOREStation/SpadesNeil-trashpile-patch
Radio jammer trash frequency nerf
2017-07-07 01:26:54 -04:00
Spades
1c6e63cd51 Wilderness atmos fix (#1826)
* Atmos and mob faction fix

Should reduce lag substantially and stop planetary phoron fires.

* Active Edges

* fuck you Travis you unhelpful shit

* Testing probable problem area.

* Is THIS it?!

* Long shot, but let's try it.

* Just to kick Travis again

* oops
2017-07-07 01:09:42 -04:00
Spades
6a1d844f7a Radio jammer frequency nerf
The radio jammer is very obnoxious, and I feel like it should not appear as often as it does. Every shift I have been on since its addition has seen a jammer easily located.
2017-07-06 15:33:34 -04:00
Spades
d47b9d5df1 Merge remote-tracking branch 'refs/remotes/origin/master' into gateway-stoof
# Conflicts:
#	code/modules/mob/living/simple_animal/vore/otie.dm
#	icons/mob/vore64x32.dmi
2017-07-05 11:33:24 -04:00
Spades
09d351aff9 oops 2017-07-04 20:09:04 -04:00
Spades
0540593119 Final additions and fixes 2017-07-04 20:01:38 -04:00
Spades
4367bc2da7 sleepy commit 2017-07-04 06:38:32 -04:00
Verkister
7333ea008f Taur and borgo feature shieet!
-Added a counter for janihound to keep track of how much crap it's ate.
-Lowered janigut capacity to 25 items.
-Made mice edible for the borgo.
-Gave a gentle touch to the wolftaur sprites. (more types later?)
-Added a saddlebag version that fits itself for every quadtaur.
-Added a robust combat aesthetic saddlebag as a childtype to the forementioned.
2017-07-03 21:05:17 +03:00
Spades
08704251b2 Merge pull request #1793 from VOREStation/guns
Dakka Dakka
2017-07-02 02:29:46 -04:00
Spades
36f32b1ab6 Merge pull request #1756 from Verkister/cargoandborgo
Cargo and borgo stuffs. [change check a whole week overdue!]
2017-07-02 02:20:25 -04:00
Spades
2f9c8b48b4 Merge remote-tracking branch 'refs/remotes/origin/master' into guns 2017-07-02 00:30:23 -04:00
Spades
3db35eb684 Dakka Dakka
- Removed gun_vr judge, Polaris has one now.
- Removed vorestation m44 mags, Polaris has those now.
- Removed detective's .44 magnum because NO YOU CANNOT HAVE A FUCKING
MAGNUM
- Corrected inconsistent naming of .44 speedloaders
- Corrected inconsistent naming of .357 speedloaders
- Fixed broken calibers for .357 stuff to be consistent with upcoming
Polaris sync.
2017-06-30 22:42:08 -04:00
Leshana
1507a0330c Fixes ammo paths changed by PolarisSS13/Polaris/pull/3541 in VOREStation custom code. 2017-06-30 22:34:15 -04:00
Leshana
18b1828631 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-20170630 2017-06-30 22:31:43 -04:00
Anewbe
12be304ba4 Merge pull request #3528 from VOREStation/aro-pol-defibs
Ports Bay/Paradise Defibs
2017-06-25 16:15:01 -05:00
Anewbe
2bd869026a Merge pull request #3534 from Neerti/6/13/2017_infiltrators
Adds a new Infiltrator Gamemode (Team Traitor)
2017-06-24 12:32:16 -05:00
Verkister
e2c749288d A shave.
-Replaced unnecessary fluff mentions with something else.
2017-06-23 09:56:24 +03:00
Verkister
0499fec8b8 Minor adjustments.
-Small health nerf for unarmored oties.
-Comment blabbery.
-Halved crate chance for the cosmetic difference oties (like the bears do I think?)
2017-06-23 09:25:24 +03:00
Spades
df7d0eb05f .dm file changes first 2017-06-19 22:29:24 -04:00
Verkister
978363021f Retry for the cargo and borgo stuffs.
-Added Eggnerd limb design disk to the mail order pack.
-Added the non-security oties on the pred crate picklist.
-Added mail order guard puppy crate. (the frankensteinian voremobcode+followerpetcode+beepskycode combowombo)
-Attempts a workaround for janihound belly not bulging from people. (I swear it was working before the merged code cleanup :v)
-Janihound sprites centered properly.
-Made remains(mouse skeletons etc.) edible again.
2017-06-18 04:01:14 +03:00
Neerti
dbdc88dd88 Adds a new Infiltrator Gamemode (Team Traitor) 2017-06-16 18:03:10 -04:00
Anewbe
99320866b0 Merge pull request #3530 from VOREStation/qdel-hints-gen-4
Qdel Hints Round IV
2017-06-16 16:21:58 -05:00
Anewbe
7cb81853a4 Merge pull request #3529 from VOREStation/qdel-hints-gen-3
Qdel Hints Round III
2017-06-16 16:17:33 -05:00
Leshana
6a0cc39419 Fixes objects using walk_to() not being able to be garbage collected.
* Okay evidently walk_to(A, B) doesn't stop when A reaches B, but keeps running in the background forever until it is manually canceled!  Therefore in order to be garbage collected, we must cancel walking on any object that might have initiated it.
* Fixes this on chemsmoke and spiders.
* The same story applies to walk_towards; fixed for dust, meteors and immovablerod, and also to walk_away; fixed for flashbangs.
* Also fixed chemsmoke actually getting qdeled at the right time.
2017-06-16 13:40:15 -04:00
Arokha Sieyes
4419d5dc9c Merge pull request #1734 from VOREStation/chemsmoke-fix
Fixes objects using walk_to() not being able to be garbage collected.
2017-06-15 19:12:16 -04:00
Leshana
f60c024b2a Fixes objects using walk_to() not being able to be garbage collected.
* Okay evidently walk_to(A, B) doesn't stop when A reaches B, but keeps running in the background forever until it is manually canceled!  Therefore in order to be garbage collected, we must cancel walking on any object that might have initiated it.
* Fixes this on chemsmoke, spiders, and aiholos.
* The same story applies to walk_towards; fixed for dust, meteors and immovablerod, and also to walk_away; fixed for flashbangs.
* Also fixed chemsmoke actually getting qdeled at the right time.
2017-06-15 18:46:39 -04:00
Leshana
c91dc333cd Some more types which need Destroy to return qdel hints! 2017-06-14 01:13:54 -04:00
Leshana
4b46703d9d A plethora of Destroy() fixes - return qdel hints and clean stuff up. 2017-06-14 01:07:35 -04:00
Leshana
48edfb2fdc Some more types which need Destroy to return qdel hints! 2017-06-14 00:59:32 -04:00
Arokha Sieyes
836970e310 emag_act tweak since Bay's is different 2017-06-13 11:45:50 -04:00
Arokha Sieyes
69a95cce08 Tweak defib time and damage 2017-06-13 10:22:16 -04:00
Arokha Sieyes
fad93cf366 Ports Bay/Paradise Defibs
I like the ones I wrote, but these are proooobably better.

They have normal units, which are worn on the back and you can grab the paddles out of to shock people.
Then there's compact units, which are worn as a belt, and serve the same purpose.
And finally there's the combat units, which allow revives through spacesuits, and have no safety so you can zap living people on harm intent (good for antags? CMO?).

These appropriately check for blood, a heart, etc. So, in that way, they're a bit more realisic than my original ones which I was sorta lazy in writing.
Emagging them turns off the safeties, allowing them to zap people who are still alive.

I actually cleaned up their sprite choice code a little and added a sprite for the 'combat' one since previously it was just the emagged sprite (flashing exclamation point). Now it's just got a red heart monitor, and the emagged ones keeps the exclamation.

Did make one balance change in that compact ones use twice the power (inefficient small capacitors? or something?).
2017-06-12 14:51:39 -04:00
Arokha Sieyes
31b5d4e4db Merge pull request #1711 from VOREStation/more-qdel-fixes
More qdel fixes
2017-06-12 10:28:48 -04:00
Arokha Sieyes
8eb9b5e3ab SM3200 warning when taking whole mind
So you know it's gonna KO them.
2017-06-12 10:10:15 -04:00
Leshana
cae4b3f12c A plethora of Destroy() fixes - return qdel hints and clean stuff up. 2017-06-11 23:48:17 -04:00
InterroLouis
9d1e00966f Update security.dm
Fixes the detective locker speedloaders for real this time.
2017-06-11 23:35:13 -04:00
Leshana
4f138abfcc Converts Resleeving Transcore to be a subsystem
* Since the transcore has a ticker process, it really should be a subsystem.  Converted it over.  However, because its ticker is so fast, I did not bother implementing MC_TICK_CHECK into it.  Therefore it has the SS_NO_TICK_CHECK flag.
* Because its a subsystem, the global variable is now SStranscore instead of transcore.
* Because subsystems are so easy to debug, I removed the "TC" debugging variable from the machines that used it.
* Organized a few files.  The transcore subsystem is in the subsystems folder.  Defines had to be moved to defines folder so they are included first.
2017-06-11 18:32:40 -04:00
Arokha Sieyes
809927c139 Merge pull request #1693 from VOREStation/aro-sleevemate
Adds the SleeveMate 3200
2017-06-11 14:39:43 -04:00