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

6986 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
Fox McCloud
2b25584372 Merge remote-tracking branch 'upstream/master' into remove-weapons 2018-04-19 17:01:38 -04: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
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
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
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
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
CoreyLee Hassell
5cef36efdf Changed defib timer from 3 minutes to 5 minutes 2018-04-12 18:39:54 -04:00
Kyep
2cb4e1f75c Fox requests 2018-04-08 08:03:34 -07: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
tigercat2000
a7b6e00bd3 Merge pull request #8853 from Dyhr/master 
Agent ID occupation options
 2018-04-06 20:54:43 -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
57a4be2138 Merge pull request #8794 from Birdtalon/fixes 
Fixes and tweaks
 2018-04-06 20:02:07 -07:00
tigercat2000
413832ee27 Merge pull request #8837 from Kyep/better_demotions 
Better ID computer logging
 2018-04-06 20:01:38 -07:00
Fox McCloud
af7abe2679 Makes Stacks Garbage Collect 2018-04-06 19:32:08 -04:00
tigercat2000
639c40d140 Merge pull request #8824 from Fox-McCloud/gc-ss-port 
Ports TG's Garbage Subsystem
 2018-04-05 20:49:04 -07:00
Rasmus Dyhr Larsen
5065221dd6 Added agent id occupation options 2018-04-05 23:59:50 +02:00
Fox McCloud
b2af86bb3c styling 2018-04-04 19:52:31 -04:00
Fox McCloud
f7521320a0 fixes the runtimes 2018-04-04 19:14:22 -04:00
shazbot194
234c8a78bc Merge conflict fix 2018-04-04 12:18:07 -08:00
uraniummeltdown
7f2f8363d8 separates alien structures and effects into own files 
fixes aliens not being able to open egg
 2018-04-04 23:18:12 +04:00
Fox McCloud
39c5aa0bf7 one Destroy loop fix 2018-04-04 06:03:45 -04:00
Fox McCloud
1d80bf01c0 Merge remote-tracking branch 'upstream/master' into gc-ss-port 
# Conflicts:
#	paradise.dme
 2018-04-03 18:21:04 -04:00
Kyep
b0fb593210 Better ID computer logging 2018-04-02 19:09:50 -07:00
tigercat2000
8e5a42a7a1 Merge remote-tracking branch 'upstream/master' into night_shift 
# Conflicts:
#	code/world.dm
 2018-04-02 17:24:36 -07:00
Crazy Lemon
c535a6cd59 Merge pull request #8804 from MINIMAN10000/rcd-lattice 
RCD floors work on lattice & space
 2018-04-01 21:23:07 -07:00
tigercat2000
27dceb6131 Merge pull request #8613 from shazbot194/E-pistols 
Adds in energy pistols
 2018-04-01 20:42:42 -07:00
shazbot194
adcf2dcada Merge fix 2018-04-01 19:17:48 -08:00
tigercat2000
e67ba4ecd8 Merge pull request #8503 from Kyep/frikin_laser_beams 
Fixes #6229 - tripwire mines not working / brings back frikin' laser beams
 2018-04-01 18:47:31 -07:00
tigercat2000
e71c4279a7 Merge remote-tracking branch 'upstream/master' into night_shift 
# Conflicts:
#	paradise.dme
 2018-03-30 10:20:21 -07:00
Birdtalon
b334bc4a88 defibrillator no longer yields infinite paddles 2018-03-30 13:12:44 +01:00
Fox McCloud
22dc6860b3 Ports TG's Garbage Subsystem 2018-03-28 20:02:39 -04:00
Fox McCloud
5701ea7c75 Ports Nano UI to Subsystems 2018-03-26 23:59:52 -04:00
Kyep
e014f02324 Improves admin outfits, fixes magboots being missing 2018-03-26 15:44:17 -07:00
tigercat2000
bc4fb3d79b Nightshifts & Randomized Station Time 
This commit adds the Nightshift lighting mode from /tg/. From 19:00 to
07:00 in station time, the station will go into a reduced-lighting mode,
with dimmed lights across the station.

In conjunction with this, there is a new configuration option to start
the shift time at a random time other than 12:00, so that players are
more likely to experience a night shift (as opposed to having to have a
7 hour round).
 2018-03-25 23:01:04 -07:00
tigercat2000
338631744f Merge pull request #8798 from Fox-McCloud/fire-subsystem 
Ports over Fires to Subsystems
 2018-03-25 16:02:31 -07:00
Fox McCloud
7a548473d4 name 2018-03-25 18:52:06 -04:00