Commit Graph

8233 Commits

Author SHA1 Message Date
Shadowlight213
8035651400 Finishes id computer
adds designs for computer parts to rnd and cases to the autolathe.
2016-08-09 22:55:07 -07:00
Shadowlight213
4ebeec67d6 Adds header icons
Does some fixes and cleanup
Some consoles added to the map and tablets added to job loadouts for testmerging.
2016-08-06 23:05:05 -07:00
Joan Lung
672577c956 Hyper-kinetics will no longer cause gibtonite to instantly explode (#19677)
* Hyper-kinetics will no longer cause gibtonite to instantly explode

* how... likely is that
2016-08-05 17:51:12 -05:00
Arctophylax
d374ff92e6 Fixes Kitchen Spike Buckling (#19712) 2016-08-05 17:00:52 -05:00
oranges
e5f8f2bc1f Merge pull request #19681 from Cruix/buckled_mobs_fix
Added some has_buckled_mobs() checks.
2016-08-05 12:07:02 +12:00
Robustin
6909ccc43e Cult balance pass (#19662)
* Runed metal to supply talisman

* Cult items update

* Cult floor overlay

* Cult overlay

* Mesons-Proof floors

* Fixes

* Fixes 2

* Fixes 3

* Runed metal costs

* Void Torch Concept

* Void Torch

* Torch available at altar

* Torch Fix
2016-08-05 11:57:47 +12:00
unknown
0f6feb2d44 Fixed being able to spam grilles on a single tile with an RCD. 2016-08-03 00:43:28 -07:00
unknown
011fe6348b Fixed a bug where you could spam-click on a floor with an RCD on wall mode to use all its ammo.
Added feedback to RCDs attempting operations without enough ammo.
2016-08-03 00:24:31 -07:00
oranges
74b35d4247 Improve ruin overlay code for tape device (#19667) 2016-08-03 02:50:48 -05:00
unknown
5ea9203c7f Added some has_buckled_mobs() checks. 2016-08-02 23:39:29 -07:00
TheCarlSaganExpress
86c04cdc69 Added lighting effects to the welder. (#19640)
* Test branch.

* Added lighting effects to the welder.

* Added changelog.

* As requested by optimumtact, a switched_on() and switched_off() proc have now been implemented. The toggle proc has been removed in favor of the switched_on/off procs.
Some of the other procs have been moved around for clarity, i.e. the examine proc for the welder is now on line 427.

* As requested by optimumtact, a switched_on() and switched_off() proc have now been implemented. The toggle proc has been removed in favor of the switched_on/off procs.
Some of the other procs have been moved around for clarity, i.e. the examine proc for the welder is now on line 427.
2016-08-03 10:25:11 +12:00
Lularian
feafb59f0e 111111111111111 2016-08-01 16:58:34 -05:00
oranges
b91e14c826 Merge pull request #19472 from Fox-McCloud/refund-refactor
Refactor Uplink Refunding
2016-08-02 08:59:15 +12:00
bawhoppen
1fecd12aaf no really who is da king (#19537)
add: Added crowns. Make them from gold. Cap gets a fancy one.

Crowns get some armor but are overall worse than sec gear.
2016-08-01 13:58:11 +12:00
oranges
68e85feb47 Merge pull request #19589 from ChangelingRain/ahorriblewishacursecutshortawantsodeepitrunsinboneandbrain
Simple animals can now have a set amount of damage to deal to objects in place of normal melee damage
2016-08-01 10:57:45 +12:00
Joan Lung
a6decc14ab Increases toolbox force by 20% (#19592) 2016-07-31 11:37:37 -05:00
Joan Lung
bcfe0be2d0 Potted plants now layer properly (#19546)
* Potted plants now slow you down slightly

* we manage to pull her away

* no message
2016-07-30 12:18:12 -05:00
Joan Lung
60b32ddd85 Simple animals can now have a set amount of damage to deal to objects in place of normal melee damage 2016-07-30 09:14:53 -04:00
oranges
29272c92f5 Revert "listen to me, this is all I really wanted all along" 2016-07-30 22:44:02 +12:00
Lularian
eee517f5b7 look me in the eyes, please... 2016-07-28 17:28:44 -05:00
KorPhaeron
5f5cd82f51 Doomslayer Fixes/Balance (#19485)
* Doomslayer Fixes

* Fix for projectile blocking

* Removed redundant chemical from doomslayer
2016-07-29 08:22:41 +12:00
NikNakFlak
a7b6e60d65 Sprite changes for bedsheets/signs, minor code cleaning (#19377)
* Bedsheets, sprite changes, sign

* Spelling

* Ugh, oldcode ew

* More more more

* does a thing

* Holy shit batman, this map merging thing sucks
2016-07-28 21:02:33 +12:00
oranges
9eae6b5952 Merge pull request #19526 from Shadowlight213/Ashborg
Fixes borgs losing ash storm protection when reset.
2016-07-28 19:47:43 +12:00
Kyle Spier-Swenson
c9831c4afd [Ready]Makes space wind great again! (#19494)
* Makes space wind great again!
Space wind is now a scaling percent to move on pressure differences.
Space wind percent to move scales with pressure amount, and other modifers:
Actively moving (as in holding down a move key) reduces chance of getting moved by space wind by 30%
Having a wall or densed anchored object to your left or right (in terms of direction to be moved) will lower your chance to be moved in space wind by 20% in each direction. (so a wall on both sides is 40%) (Only applies to mob's with limbs)

* does the mrp
2016-07-28 09:43:51 +02:00
Shadowlight213
95220c5a7d Fixes borgs losing ash storm protection when reset. 2016-07-26 20:05:46 -07:00
Joan Lung
a49b2cfdf5 Temporary overlays are immune to lava (#19515) 2016-07-26 21:23:11 -04:00
Cheridan
ae73924372 Merge pull request #19489 from XDTM/DefibFix
Defib now checks for heart when used for heart attacks
2016-07-26 12:44:22 -05:00
Thunder12345
1220d02aca Rapiers (#19340)
* Adds Rapiers
2016-07-26 15:14:11 +02:00
oranges
f7c0d39c3e Merge pull request #19469 from Iamgoofball/patch-89
Unused Traitor Items: Powerfist
2016-07-26 09:40:32 +12:00
XDTM
27d7f703f4 Defib now checks for heart 2016-07-25 12:21:56 +02:00
oranges
665783f0fa Merge pull request #19455 from Incoming5643/patch-15
Doubles the amount of viscerators in the viscerator grenade
2016-07-25 21:17:47 +12:00
Fox-McCloud
146d14a26e Refactor Uplink Refunding 2016-07-24 09:21:37 -04:00
Iamgoofball
758d77efdb Unused Traitor Items: Powerfist
not enough damage tbh, 3% usage
2016-07-24 04:48:08 -07:00
KorPhaeron
0382041796 Remove people from spikes properly 2016-07-23 21:49:27 -05:00
Incoming5643
d7de116d28 Doubles the ammount of viscerators in the viscerator grenade
As per request
2016-07-23 21:40:54 -04:00
Joan Lung
e6259d32e3 Merge pull request #19406 from Niknakflak/ImABigBoyNow
Makes crayons not racist anymore
2016-07-23 18:40:10 -04:00
Joan Lung
afc73ef4f1 Merge pull request #19432 from KorPhaeron/morgue_fix
Morgue Light Fix
2016-07-23 18:39:42 -04:00
NikNakFlak
e40e24e220 Washing machine code is bad and so is whoever did krav_maga at first 2016-07-22 16:47:02 -07:00
KorPhaeron
8ebeee7341 Morgue Fix 2016-07-22 13:12:22 -05:00
Shadowlight213
9112e71914 Fixes merge conflicts 2016-07-22 01:04:45 -07:00
MMMiracles
23bf156fb0 Mjor: Creator of Original Assets (#19410)
🆑 MMMiracles
add: A giant wad of paper has been seen hurling through the nearby sector of SS13, officials deny existence of giant paper ball hurling through space because 'thats really fucking stupid'.
/🆑

Mjor the Creative, a wizard with the taste for the arts, has used his magical craft to form a home made of papier-mâché hurling through space because hes a wizard he can do whatever the fuck he wants. He uses his 'artistic' skill to conjure up minions to assist him when nosy people try to steal his priceless art.

He has two abilities he can use during a fight, one will summon copies of himself as mimics. Attacking a mimic does 50 brute to everyone around him and attacking him destroys all active mimics. The other ability lets him summon his crudely-drawn creations, bringing them to life to fight for him.

Killing him gives you access to his papier-mâché robe, a special collector's edition paper, and his priceless range of artwork. What more could you ask for?

The wizard's robe, when equipped, will allow the wearer to summon their own stickman allies. They are only loyal to who summoned them and will attack everything else. Ability has a cooldown between each use.

Boss code credit majority to @RemieRichards as it is a modified version of what she wrote up a couple months ago for one of my unfinished away missions.
2016-07-22 11:01:07 +12:00
NikNakFlak
1ff1582591 Adds 14 colorful beanies to game/clothesmat (#19408)
Sprites by Nienhaus with edits done to them by me


The colors look almost identical but now only the white, and striped versions of the beanies exist with the other colors being done via color variable.
2016-07-22 10:13:43 +12:00
oranges
4d70a39488 Merge pull request #19400 from Bawhoppen/mapfixes
All shuttles now use proper smoothing paths, I had to update them all by hand

I have a few more things to fix for titanium in this PR aswell

Also all syndie shuttles are now consistent with each other. (Added some more turrets since they aren't indestructible now)

(I was exaggerating/joking when I said its like 50 files changed but it turns out it actually is)

add: Titanium now spawns in mining again.
add: It has uses in R&D and robotics production.
add: All shuttle walls are now using a new proper smoothing path. Mappers please make sure to use this path correctly in the future. (along with tiles)
2016-07-22 10:11:46 +12:00
oranges
5f4816ac7b Merge pull request #19403 from Cruix/stealth_traitor_fixes
Fixed camera bugs and Voice Changers
2016-07-22 10:11:18 +12:00
Shadowlight213
5f10739385 Repaths satchels and lets angels equip them (#19371)
Repaths satchels so all the different ones are children of the normal satchel.
Allows angels to equip satchels since the satchels are on the side of the body instead of the back. Should help miners who find the potion out a bit.
2016-07-22 10:10:30 +12:00
PKPenguin321
04dd716ef0 Adds canned laughter (#19405)
* adds canned laughter

* fixes issues
2016-07-21 10:10:46 +02:00
Joan Lung
9c1bed63a7 Merge pull request #19402 from RemieRichards/ratvarian_language_reforms
Ratvarian grammar/punctuation rules in proc form!
2016-07-20 19:14:15 -04:00
Shadowlight213
ed55cefcc2 Adds admin_spawned atom var that is set when something is spawned by admin means or is var edited.
This can be bypassed by using debug-game if needed.
Stats will not be tracked for admin spawned atoms
2016-07-20 15:26:24 -07:00
Joan Lung
f2125f3c81 Sigil nerfs (#19380)
tweak: Sigils of Transgression now stun for about 7 seconds.
experiment: Sigils of Submission/Accession now take 7 seconds to convert successfully, and have an obvious message to the person on them that their mind is being invaded
2016-07-20 20:14:23 +12:00
Joan Lung
fa257f92ab Misc fixes (#19375)
* Misc fixes

* river

* delta

* waterfall

* cloudburst

* thunderstorm
2016-07-20 20:12:49 +12:00