cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-29 19:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,416 Commits 26 Branches 2 Tags
69e0eedead012bbcd95d8a135fe39e3d63bb9287
Commit Graph

27847 Commits

Author SHA1 Message Date
Kluys
69e0eedead Managed to get a space in there somehow 2018-04-24 10:21:17 +02:00
Kluys
b36ccc592f Makes the code cleaner 
dirty code is dirty, I hope this makes it better but obviously I am a newb so any input is welcome.
 2018-04-23 12:12:01 +02:00
Kluys
fe758c21e7 Window placement revert 
This commit reverts the window placement system, right now placing a one-dir window takes 2 prompts, this makes it so you just have to click a grille for it to place a one-dir window on the side you're facing.
Reverts a part of https://github.com/ParadiseSS13/Paradise/pull/8155
🆑 Kluys
Revert: Changes the window placement system back to the old system
/🆑
 2018-04-22 22:50:34 +02:00
Sam
a316c544f4 ree 2018-04-21 15:23:27 +01:00
Fox McCloud
2b25584372 Merge remote-tracking branch 'upstream/master' into remove-weapons 2018-04-19 17:01:38 -04:00
tigercat2000
ac5a276686 Merge pull request #8882 from Fox-McCloud/pipenets-gc-other 
Makes Pipenets Actually Rebuild and Pipes GC
 2018-04-18 14:14:12 -07:00
MINIMAN10000
ad53317db1 Merge Conflict Resolved 2018-04-17 11:24:50 -07:00
tigercat2000
17fd8e8a6a Merge pull request #8819 from Kyep/syndi_outfit_boots 
Improves admin outfits, fixes magboots, adds special antags
 2018-04-16 18:28:03 -07:00
tigercat2000
b9921501d8 Merge pull request #8879 from Citinited/parent-proc-fix 
Kitchen machinery now calls ..() in New()
 2018-04-16 18:25:35 -07:00
tigercat2000
66d4b79222 Merge pull request #8891 from MINIMAN10000/nobludgeon-remotes 
Adds nobludgeon to door remotes so they always work on doors
 2018-04-16 18:23:31 -07:00
tigercat2000
a9f4022fa8 Merge pull request #8874 from MINIMAN10000/cable-coil 
Cable coils can transfer part of a stack
 2018-04-16 18:12:14 -07:00
MINIMAN10000
2f873143ed Adds nobludgeon to door remotes making the remote always operate on the door 2018-04-16 17:56:35 -07:00
Fox McCloud
b3fa91030b oops 2018-04-15 22:41:42 -04:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
Fox McCloud
4f777d76ea Makes Pipenets Actually Rebuild and Pipes GC 2018-04-15 04:16:09 -04:00
MINIMAN10000
f023edefa7 Crayons color cables, cableColor now cable_color 2018-04-14 23:54:37 -07:00
tigercat2000
8b576c4d42 Merge pull request #8877 from Fox-McCloud/gc-stuff 
Adds more GC Debugging
 2018-04-14 21:28:54 -07:00
Fox McCloud
6a02689398 Merge pull request #8726 from shazbot194/Major_Tom 
Major tom
 2018-04-14 23:58:19 -04:00
shazbot194
1747f9e31e Small code improvements and description reverts 2018-04-14 17:25:56 -08:00
Fox McCloud
129e1f66f7 GC radio stuffs 2018-04-14 13:44:26 -04:00
Fox McCloud
519cee2810 Adds more GC Debugging 2018-04-14 08:05:09 -04:00
Citinited
0d71bf4388 obj/machinery/kitchen_machine/New now calls ..() 2018-04-14 11:21:54 +01:00
MINIMAN10000
d4a98ea09f Moved var/to_transfer back to /obj/item/stack turns out it's fine there 2018-04-13 19:50:26 -07:00
tigercat2000
321a5bb40f Merge pull request #8869 from Anticept/defib 
Changed defib timer from 3 minutes to 5 minutes
 2018-04-13 18:39:58 -07:00
Fox McCloud
c3bfb42f3a Merge pull request #8847 from tigercat2000/nightshift_tweak 
Make sec levels avoid overwriting an admin-forced nightshift
 2018-04-13 21:32:14 -04:00
tigercat2000
148798e06f Merge pull request #8868 from Fox-McCloud/fox-fluff 
Fox Fluff Item
 2018-04-13 18:31:50 -07:00
MINIMAN10000
5d52f60d9d Comment about where merging is handled, moved to_transfer variable to immediately above where it is used 2018-04-13 18:27:20 -07:00
MINIMAN10000
e875af3d56 Cable Coils can partial transfer, stripped depereciated code, changed cable coil message 2018-04-13 16:48:14 -07:00
tigercat2000
bee011cb05 Merge pull request #8789 from MarsM0nd/manned_up 
Man up changes
 2018-04-13 15:43:14 -07:00
Mars
fe7991da68 Revert man up message change 2018-04-13 13:27:26 +02:00
CoreyLee Hassell
5cef36efdf Changed defib timer from 3 minutes to 5 minutes 2018-04-12 18:39:54 -04:00
Fox McCloud
8c5992f1e6 Fox Fluff Item 2018-04-12 17:23:09 -04:00
KasparoVy
cf351543ce Removes Job Restriction from Purely Cosmetic and Rarely Used Veils 
Roboticist wasn't even spelled correctly. No idea if there were any other typos.
 2018-04-09 03:00:27 -04:00
Kyep
c1bf2382b8 squash 2018-04-08 08:05:31 -07:00
Kyep
2cb4e1f75c Fox requests 2018-04-08 08:03:34 -07:00
Fox McCloud
b659a1d9a1 Merge pull request #8678 from Kyep/ts_tunneler 
Terror Spider Update, Brown Terrors
 2018-04-08 01:38:34 -04:00
Fox McCloud
f9421e3b22 explicit return 2018-04-07 23:41:29 -04:00
Fox McCloud
196d0b90f9 Makes Records GC (most of the time) 2018-04-07 23:38:10 -04:00
Kyep
ca8bb33a58 Tiger requests 2018-04-07 14:01:48 -07:00
Kyep
4f3fa5c11c Tiger requests 2018-04-07 13:50:23 -07:00
tigercat2000
f60fbf9cef Merge pull request #8573 from uraniummeltdown/drone 
Makes Drones A Small Mob
 2018-04-06 21:21:50 -07:00
tigercat2000
75b876bac4 Merge pull request #8451 from Allfd/portablescrubberfix 
Fix getting sucked into scrubber machine
 2018-04-06 20:59:58 -07:00
tigercat2000
a7b6e00bd3 Merge pull request #8853 from Dyhr/master 
Agent ID occupation options
 2018-04-06 20:54:43 -07:00
tigercat2000
6743a6136c Merge pull request #8777 from MarsM0nd/admin_fax 
Fax machine changes
 2018-04-06 20:33:07 -07:00
tigercat2000
464e1a18da Merge pull request #8722 from Citinited/don't-lose-your-head 
Refactors the russian revolver, and you can no longer play RR without a head
 2018-04-06 20:24:54 -07:00
tigercat2000
a1c2da04fe Merge pull request #8705 from Birdtalon/ether 
Re balances ether into a better anaesthetic
 2018-04-06 20:21:04 -07:00
tigercat2000
367ed46b79 Merge pull request #8618 from Kyep/xeno_window 
Deletes Xenobio SIT docking port
 2018-04-06 20:13:37 -07:00
tigercat2000
86f89382c4 Merge pull request #8834 from Crazylemon64/hotelsec_lootnerf 
Nerfs loot-pinata-ing of hotel guards
 2018-04-06 20:07:30 -07:00
tigercat2000
60f8a049d7 Merge pull request #8851 from Birdtalon/atmos-access 
Buffs atmos access
 2018-04-06 20:03:58 -07:00
tigercat2000
57a4be2138 Merge pull request #8794 from Birdtalon/fixes 
Fixes and tweaks
 2018-04-06 20:02:07 -07:00