Commit Graph

1776 Commits

Author SHA1 Message Date
lass9030
6776bdb242 add uniform to blueshield locker 2018-10-17 01:19:58 +02:00
warior4356
e8bffc5c3d Final tweaks 2018-10-15 19:13:52 -07:00
warior4356
3707242e64 Fixed a UI lag issue 2018-10-14 18:25:36 -07:00
warior4356
4eeb26aa0f Fixed examine_status and changed manufacturer 2018-10-14 17:45:43 -07:00
warior4356
c46e357954 Minor tweaks. 2018-10-14 17:39:02 -07:00
warior4356
e5a24dc82d Adds a comment 2018-10-14 03:38:55 -07:00
warior4356
12c538ea0e Used Wrap incorrectly, max is exclusive 2018-10-14 03:26:42 -07:00
warior4356
8b83e58ea0 Invalid combinations fixed 2018-10-14 03:09:48 -07:00
warior4356
5c37ea5449 Small bug fix. 2018-10-13 23:34:03 -07:00
warior4356
c7efdfaa29 Maybe finished? Needs testing. 2018-10-13 23:33:07 -07:00
Purpose
b2fc276158 Merge remote-tracking branch 'refs/remotes/origin/master' into smoothing-improvements 2018-10-13 21:34:04 +01:00
variableundefined
65c246c1c9 TG container_type refactor 2018-10-13 08:20:52 +08:00
Mars
984339ce42 Merge-conflict fix + check for null rather than type. 2018-10-12 18:59:54 +02:00
variableundefined
96f5046f19 Merge pull request #9817 from SamHPurp/stool-bed-chair-fixes
A few fixes
2018-10-12 13:48:02 +08:00
variableundefined
376cdc709a Merge pull request #9818 from farie82/twohanded-fix
Fixes the giving of required two handed items and chainsaw stuf
2018-10-12 13:24:19 +08:00
Purpose
6c6d35d133 fixies 2018-10-11 22:02:23 +01:00
joep van der velden
c96adec91f Fixed it 2018-10-11 22:55:10 +02:00
Desolate
f7627d2fcb Resolves conflicts. 2018-10-11 05:36:22 -05:00
variableundefined
f23b3ae178 Merge pull request #9793 from Citinited/emag-locker-fix
Removes redundancy in emagged locker description
2018-10-10 08:02:32 +08:00
Citinited
8b5df00759 Removes recundancy in emagged locker description 2018-10-09 21:46:38 +01:00
Mars
d9b60a7bfb Fix merge conflict 2018-10-09 09:41:37 +02:00
Purpose
4d7dd5a6c9 dayum dats defined 2018-10-08 22:48:00 +01:00
Crazy Lemon
c068680651 Merge pull request #9658 from variableundefined/DunGoofGrille
Change grille cooldown to 1 second instead
2018-10-08 01:08:19 -07:00
Crazylemon64
3db4229918 First big chunk of the refactor
mid-refactor of `take_overall_damage`

Fully refactors the (?:take|heal)_(?:overall|organ)_damage procs

Allows the dead to examine

Removes the `blinded` var

Refactor cyborg components so vision loss is instant

Robot life/death updates instantly

Adds instant updates for damage overlays and HUD icons for humans

Final reconciliation with the species refactor

Adds a stat debugging system and debugging logs

Also fixes instant death on species change

"Debugging logs" are used for stuff an admin wouldn't care about but
someone debugging would

I used it to fix people dying instantly when changing species due to
temporary deletion of the brain

Fox's requests

Adds a more careful updating system to our reagents system
2018-10-07 17:52:04 -07:00
tigercat2000
d4d340ddf8 Merge pull request #9721 from SamHPurp/damnit-chairs
Fixes incorrect chair assignment
2018-10-06 16:50:21 -07:00
SkeletalElite
9912529ab7 Grammar Fix
"a meat spike" resulted in weird stuff like "a meat spike is hit by the laser!"
2018-10-06 15:39:04 -07:00
Purpose
50c393f78a missed a chair declaration 2018-10-06 22:53:34 +01:00
Purpose
d335a5a4ce Subsystem created... works! 2018-10-06 20:05:02 +01:00
Purpose
3b50aad95d oh lets not pick up wheelchairs either 2018-10-06 16:47:06 +01:00
Purpose
63dfd411aa Resolved merge conflicts... I hope. 2018-10-06 16:01:34 +01:00
Desolate
4c062212ab refactors global lists. 2018-10-06 08:02:45 -05:00
Purpose
9d2c4d1438 boring fix 2018-10-04 14:15:34 +01:00
Desolate
c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
variableundefined
69209eb847 Change grille cooldown to 1 second instead 2018-10-01 09:01:48 +08:00
Dedhia
ec3d7379f0 Adds Grille Cooldown 2018-09-30 16:42:22 -07:00
TDSSS
0ad8a2b2de Makes weapons that deal no damage unable to ignite plasma statues 2018-09-30 16:44:00 +02:00
Purpose
c82cd93a89 Merge branch 'master' into Refactors-beds-stools-chairs 2018-09-29 15:36:27 +01:00
variableundefined
68c35ccced Merge pull request #9527 from Ty-Omaha/muh-art
Fixes half the server crashing, removes canvases
2018-09-29 07:49:30 +08:00
variableundefined
b9adf71445 Merge pull request #9550 from SamHPurp/well-defined,-some-would-say-chiseled
Updates use_power to use the Defines
2018-09-27 21:47:04 +08:00
Crazy Lemon
ae68d43d46 Merge pull request #9032 from Anasari/CabinetDecon
Allow you to construct & deconstruct fire extinguisher cabinet
2018-09-26 17:31:15 -07:00
variableundefined
a499b0fc68 Paving the path for a bigger inventory refactor 2018-09-23 22:26:10 +08:00
Kluys
82f112ab24 fixes 2018-09-17 20:18:56 +02:00
Kluys
c37b255912 Window alt clicking utility
Alt clicking a window now checks both directions for availability, a clockwise rotation takes priority but when a window is already present it will rotate the window counterclockwise instead.

(prior to this it would state that the window cannot be rotated in that direction if the clockwise direction is unavailable)

https://puu.sh/Bwx9X/69079c06f2.gif A gif to show the new situation

I intentionally left out checking for the direction opposite to the current one as that would allow for an easy way to get into the station without being affected by fastmos.
2018-09-17 19:25:28 +02:00
Purpose
037f215d16 updates vars to use the defines 2018-09-16 01:22:57 +01:00
Purpose
31f9b7bdff lets not pick up electric chairs either 2018-09-14 18:56:07 +01:00
Purpose
efbcd54cf2 Fully refactors Chairs, Stools & Beds. Adds a few fun bits 2018-09-14 18:40:42 +01:00
Ty-Omaha
28acdb1e56 removes canvases 2
fully removes it as per tiger's critique
2018-09-12 02:40:32 -04:00
Ty-Omaha
52ab5abb0c canvas removal 2018-09-12 02:15:15 -04:00
Aurorablade
6d4d4ba8a4 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HereWeGoAgain 2018-09-06 21:46:19 -04:00
IrkallaEpsilon
c70f42d139 Attacking mirrors is now not spamable anymore
Kinda a funny bug that you can attack mirrors without a cooldown. A bug nonetheless. Not sure if this should fix it, but it was used to fix the no cooldown on Gas Cannisters.
2018-09-04 20:40:49 +02:00