Commit Graph

1598 Commits

Author SHA1 Message Date
variableundefined
462d38390e Merge pull request #9995 from Mitchs98/secjacket
Adds the Security Jacket to Security Lockers.
2018-10-28 12:11:14 +08:00
joep van der velden
8d59cbeefb Check first 2018-10-27 16:24:32 +02:00
Mitchell
cd472a0d91 Adds Security Jacket to Security Locker 2018-10-26 20:12:07 -05:00
alex-gh
3d5ef06986 Fixed roller beds not going to their "down" position. 2018-10-27 01:41:19 +02:00
variableundefined
a432def813 Merge pull request #9982 from dovydas12345/Ghost-table-flip
No more magical ghosts flipping tables
2018-10-26 20:19:38 +08:00
dovydas12345
d89fd31810 No more magical ghosts 2018-10-26 14:57:06 +03:00
variableundefined
d6c442caa5 Merge pull request #9950 from Dave-TH/surgery_tray
Surgical Trays
2018-10-25 14:27:04 +08:00
variableundefined
3a980bc95f Merge pull request #9965 from warior4356/Safe-Refactor
Fixed safe noises
2018-10-25 07:16:39 +08:00
warior4356
7d5cb5a216 Fixed safe noises
Fixed unlock noises coming from tumbler 2 on every turn of tumbler 1, once tumbler 2 was unlocked.
2018-10-24 15:45:10 -07:00
Aurorablade
654ed40fa8 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HereWeGoAgain 2018-10-24 02:21:36 -04:00
Dave
12389125aa Review Concerns 2018-10-22 18:54:41 -04:00
Unknown
1cd8d2f98f Surgical Trays
Adds Surgical Trays
2018-10-22 17:37:51 -04:00
variableundefined
600de8ba24 Deconflict 1 2018-10-21 07:56:55 +08:00
variableundefined
45fdcb4c46 Merge pull request #9719 from SamHPurp/smoothing-improvements
Icon Smoothing to StonedMC
2018-10-21 07:41:47 +08:00
variableundefined
7c42d596bb Merge pull request #9567 from Bram961/master
Window alt clicking utility
2018-10-21 07:30:47 +08:00
Kluys
c62b0a1a1c Typo fixu 2018-10-20 18:15:14 +02:00
Mark Mak
05bd6bd088 Merge pull request #9843 from warior4356/Safe-Refactor
Safe Refactor
2018-10-19 12:35:59 +08:00
warior4356
fead9e552e Updated logo and description. Removed NT logo from UI 2018-10-18 18:36:56 -07:00
Mark Mak
91dcf447ec Merge pull request #9888 from Fox-McCloud/spark-refactor
Refactors Spark Spread Activation
2018-10-19 08:41:03 +08:00
Mark Mak
4bc1a1c1ef Merge pull request #9363 from MarsM0nd/Refactor_UID
Href refactor: macros and playerpanel
2018-10-19 07:46:42 +08:00
warior4356
f3fc4548b6 Requested code changes done, please recheck 2018-10-17 13:36:25 -07:00
Fox McCloud
3825b4e1d5 Refactors Spark Spread Activation 2018-10-17 14:31:07 -04:00
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