Commit Graph

703 Commits

Author SHA1 Message Date
variableundefined
5357e0e36f Merge pull request #11428 from Markolie/bundles
Chameleon overhaul
2019-05-04 08:23:40 +08:00
variableundefined
8928210da1 Merge pull request #11425 from Arkatos1/delay
Examine tooltips tweaks
2019-05-03 22:48:15 +08:00
Mark van Alphen
86b90bab2c And fix the uplink kits 2019-05-01 21:01:16 +02:00
Mark van Alphen
e9d39b0d27 Chameleon overhaul 2019-05-01 20:59:41 +02:00
Arkatos1
24b0eb0c0c toolbelt update 2019-05-01 16:57:54 +02:00
Arkatos1
c6a91eafdd Tweaks 2019-05-01 16:04:07 +02:00
Arkatos1
791bebf51c Tweaks to Examine tooltips 2019-05-01 15:50:30 +02:00
Fox McCloud
89883a7b28 fixes 2019-04-24 00:49:23 -04:00
Fox McCloud
0034e851a1 Kills off Object and Fast Object Processes 2019-04-23 23:53:40 -04:00
variableundefined
31a2779bae Merge pull request #11259 from Markolie/flukeops
Nuke Ops updates and buffs
2019-04-18 07:16:31 +08:00
Mark van Alphen
f63b587f54 Nuke ops updates 2019-04-07 21:57:22 +02:00
variableundefined
7416eebf7f Merge pull request #11265 from Fox-McCloud/fix-pill-bottles
Fixess Being Unable to Open Pill Bottles
2019-04-07 22:12:01 +08:00
Fox McCloud
c0ca397d8a Fixess Being Unable to Open Pill Bottles 2019-04-07 09:25:45 -04:00
variableundefined
53d64d818d Merge pull request #11225 from TDSSS/box-revolver
Trick revolver comes in a box.
2019-04-07 21:14:51 +08:00
variableundefined
cc831667cd Merge pull request #11081 from Kyep/hijack_limits
Syndie Uplink changes (better interface, hijack-only firegrenades)
2019-04-04 09:30:56 +08:00
TDSSS
2ba5ec0228 fake revolver kit creation 2019-04-03 20:43:55 +02:00
variableundefined
e6ef2e9bbc Merge pull request #11151 from Fox-McCloud/suicide-refactor
Suicide Refactor
2019-03-29 20:49:18 +08:00
Fox McCloud
d0ea5ee8b9 Crit Rework Final Submission 2019-03-28 17:28:00 -04:00
Fox McCloud
a8dc5770db whoops 2019-03-27 23:09:21 -04:00
Fox McCloud
814e492a55 Suicide Refactor 2019-03-27 22:54:26 -04:00
variableundefined
85ab7a8b06 Merge pull request #11065 from Fox-McCloud/pill-bottles-and-patch-packs
[Goonchem] Pills, Bottles, Patches, and Pillbottles
2019-03-24 17:51:00 +08:00
variableundefined
a34c8dda8f Merge pull request #11076 from AzuleUtama/syndieMedBagChanges
Removes MMI from uplink surgery kit - makes it a separate purchase for Roboticists
2019-03-24 17:47:02 +08:00
variableundefined
7950a53d37 Merge pull request #11049 from Tails2091/lockbox-fix
Lockbox now kicks user out upon locking #11046
2019-03-23 19:59:05 +08:00
Fox McCloud
585dcb4355 sprite 2019-03-22 23:25:45 -04:00
Kyep
3559a77d0f Uplink improvements 2019-03-19 04:35:03 -07:00
AzuleUtama
29aa1ccef7 Removed MMI from surgery bag, made it Roboticist only 2019-03-18 20:22:38 +00:00
Fox McCloud
d61bbe807d [Goonchem] Pills, Bottles, Patches, and Pillbottles 2019-03-17 21:30:10 -04:00
Tails2091
8865cbeb83 3 is now 2 and 4 is now 3
My bad.
2019-03-17 17:01:54 -04:00
Tails2091
e4b9988b85 Lockbox now kicks user out upon locking 2019-03-15 12:53:00 -04:00
variableundefined
6549234b8c Merge pull request #10968 from Fox-McCloud/his-grace
His Grace Binds His Will
2019-03-07 08:49:05 +08:00
Fox McCloud
8318ca338c tweaks 2019-03-02 10:10:04 -05:00
Fox McCloud
6bd0ecfab0 tweaks 2019-03-02 10:03:09 -05:00
Dave
ebe99e8986 Applies what my mom taught me about conflict resolution 2019-03-01 18:51:04 -05:00
Fox McCloud
185f5d5fd6 better code, fixes, and tweaks 2019-03-01 00:09:48 -05:00
Fox McCloud
b47057b452 whoops 2019-02-28 19:18:12 -05:00
Fox McCloud
705a4c27a0 His Grace Binds His Will 2019-02-28 19:12:48 -05:00
UmeFuu
923e372926 Deletes leftover code 2019-02-25 21:55:52 -03:00
Dave
e5d01311d6 Review Concerns 2019-02-23 23:00:53 -05:00
Dave
5664206697 review changes 2019-02-17 14:44:49 -05:00
Unknown
5ab0af3b25 Medical QoL PR 2019-02-15 00:10:08 -05:00
UmeFuu
75f49c435c Fix typo 2019-02-13 21:34:36 -03:00
UmeFuu
c72a623ec6 Fixes cookie tray code
Makes it kinda shorter, more flexible for future variations of cookies.
2019-02-13 17:37:54 -03:00
UmeFuu
4f371cb7c2 Adds trays with cookies
Adds two trays, one with x6 cookies and the other with x6 sugar cookies, needed for the new cookies recipe.
2019-02-12 20:28:54 -03:00
variableundefined
943a21a776 Merge pull request #10818 from datlo/freegolems
Port Mineral golems and Free Golems
2019-02-11 20:37:07 +08:00
Fox McCloud
d61fa732f3 Allows Leather Satchel Strap Switching 2019-02-08 16:46:07 -05:00
datlo
224f32bab3 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into freegolems 2019-02-03 06:41:02 +00:00
datlo
74a3631741 compilin and mostly workin
has runtimes due to body color
need to wrap up commented procs
2019-02-03 06:40:50 +00:00
Fox McCloud
01d20eb7af Ensures Some Diseases Cannot Be Cheesed 2019-02-02 17:50:05 -05:00
variableundefined
1e22ffa784 Merge pull request #10793 from AzuleUtama/iveGotAPresentForYa
Adds Pack of C-4 Explosives
2019-02-02 09:45:10 +08:00
AzuleUtama
d826f51dcb Adds the pack of c4 explosives 2019-01-31 01:50:32 +00:00