cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-01 21:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,556 Commits 26 Branches 2 Tags
f28285e16fae1fa95b4bf3d2f3713b96a2bfc7df
Commit Graph

7013 Commits

Author SHA1 Message Date
Fox McCloud
e649a72923 Emptying Stop-gap 2018-04-30 03:53:49 -04:00
tigercat2000
3c1fbf9cc5 Merge pull request #8938 from Fox-McCloud/guillotine 
Ports Guillotine
 2018-04-29 20:28:50 -07:00
Fox McCloud
bc6f664b51 tweak 2018-04-29 22:58:18 -04:00
tigercat2000
44deafe987 Merge pull request #8907 from Bram961/Window-placement 
Window placement revert
 2018-04-29 19:40:32 -07:00
Fox McCloud
63e2a175fd Merge remote-tracking branch 'upstream/master' into timer-subsystem 2018-04-29 21:14:11 -04:00
Fox McCloud
4474757e14 edge case 2018-04-29 19:16:04 -04:00
Fox McCloud
cfe182a1f7 Ports over Timer Subsystem 2018-04-28 20:26:04 -04:00
Fox McCloud
8f5f57dd0b adds clapping 2018-04-27 19:27:47 -04:00
Fox McCloud
b238dfc581 Ports Guillotine 2018-04-27 18:58:23 -04:00
Fox McCloud
9266789511 stop this now 2018-04-26 19:51:22 -04:00
Fox McCloud
cb423dfb1b Ports Looping Sounds 2018-04-26 19:18:24 -04:00
Fox McCloud
8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
tigercat2000
e086908c44 Merge pull request #8897 from Fox-McCloud/adds-frame 
Adds F.R.A.M.E. Cartridge
 2018-04-25 18:57:29 -07:00
Fox McCloud
4243947e7a tweak 2018-04-25 21:48:44 -04:00
tigercat2000
3bf0f18b52 Merge pull request #8916 from Tayyyyyyy/soap_qol 
Soap QOL
 2018-04-25 16:16:14 -07:00
tigercat2000
ad24d3a584 Merge pull request #8901 from Fox-McCloud/component-port 
Ports TG Components and R&D Tweaks
 2018-04-24 19:01:49 -07:00
tigercat2000
5b68c2189c Merge pull request #8918 from Fox-McCloud/fluff-spawn-fix 
Fixes Random Plushie Spawning
 2018-04-24 18:09:11 -07:00
Fox McCloud
9860cf996e Fixes Random Plushie Spawning 2018-04-24 21:02:07 -04:00
Tayyyyyyy
8ecd9dd480 Fix coding style 2018-04-24 16:40:59 -05:00
Tayyyyyyy
ef20a187c0 Reduce soap clicks 2018-04-24 16:28:22 -05:00
Kluys
69e0eedead Managed to get a space in there somehow 2018-04-24 10:21:17 +02:00
Fox McCloud
eafd57487c Merge remote-tracking branch 'upstream/master' into component-port 
# Conflicts:
#	paradise.dme
 2018-04-23 13:54:50 -04: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
32e3a25070 got it 2018-04-21 20:25:14 -04:00
Fox McCloud
0382afcb33 Ports TG Components 2018-04-21 01:22:50 -04:00
Fox McCloud
25d331b0bb tweak 2018-04-19 21:14:00 -04:00
Fox McCloud
0f28456db3 Adds F.R.A.M.E. Cartridge 2018-04-19 20:54:59 -04:00
tigercat2000
2364b0332b Convert a bunch of name/(ckey) to key_name + ISO-8601 timestamps 2018-04-19 15:08:59 -08:00
tigercat2000
c03621c508 Completely Overhaul Logging 
This is a merged port from /tg/station and Virgo on logging standards.
The diary has been replaced with GLOB.world_game_log, diaryofmeanpeople
is gone (because it wasn't actually used) and a whole bunch of logging
procs have been changed to optimize Splunk.
 2018-04-19 15:07:59 -08: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