cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-03-31 01:22:03 +01:00
Code Issues Packages Projects Releases Wiki Activity
23,736 Commits 12 Branches 2 Tags
62fb3c29813e2894de6aa13c5653900aa51e3f72
Commit Graph

532 Commits

Author SHA1 Message Date
Markolie
f7fe8c8c6f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixes3 
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
 2015-09-28 03:05:04 +02:00
Mark van Alphen
48a3d1ab9a Merge pull request #2176 from Fox-McCloud/janicarts-and-janitors 
Janicart and Janitor Update
 2015-09-28 03:02:04 +02:00
Fox-McCloud
d7f23f4271 Oh, that kind of list 2015-09-27 19:39:09 -04:00
Fox-McCloud
155afc6131 lists 2015-09-27 19:24:35 -04:00
Fox-McCloud
d743fb1d1a pda janitor cart fixup 2015-09-27 04:48:04 -04:00
Markolie
f5f27fa186 Atmos analyzer update 2015-09-27 04:48:42 +02:00
Tigercat2000
7e843d6a4b Pixel-coords laserpointer 2015-09-26 08:45:43 -07:00
Fox-McCloud
4413911688 Janicart and Janitor Update 2015-09-26 06:17:29 -04:00
Fox-McCloud
a26bf7172b Merge pull request #2139 from Markolie/sql 
Nuke the privacy poll, offer ghosts control option, memo update, SQL update, fixes
 2015-09-23 23:42:06 -04:00
Fox-McCloud
d602d128f7 Merge remote-tracking branch 'upstream/master' into rcs-update 2015-09-23 01:19:28 -04:00
Markolie
9adff714b9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into sql 
Conflicts:
	code/controllers/configuration.dm
	config/example/config.txt
 2015-09-23 07:07:17 +02:00
Markolie
73bacbf17f Preference option for instruments/sanitize tempo 2015-09-23 07:00:01 +02:00
Markolie
bf2cabeca3 Tab 2015-09-23 03:08:38 +02:00
Markolie
b770e8f2a0 Implant fixes/updates 2015-09-23 02:51:33 +02:00
Markolie
df8209afe6 Atmos fixes 2015-09-22 05:15:05 +02:00
Fox-McCloud
f94d3305f2 map changes 2015-09-21 00:45:00 -04:00
Markolie
c5c64413a1 Pipenet overhaul 2015-09-21 02:11:54 +02:00
Fox-McCloud
1d91e31d17 pass II, taperecorder exploit fix 2015-09-18 05:46:00 -04:00
Fox-McCloud
74565c101b Fixes up a few Destroys 2015-09-18 04:20:02 -04:00
Markolie
d8ad34ee17 Item examine fix, GC testing move 2015-09-18 06:42:46 +02:00
Markolie
611cb16df8 Add torch, more in-hand fixes 2015-09-16 03:22:01 +02:00
Fox-McCloud
894d13fa4d Merge pull request #2065 from Markolie/lawstate 
Fixes
 2015-09-15 17:42:34 -04:00
Tigercat2000
c562680098 Merge remote-tracking branch 'origin/master' into bay_examine 
# Conflicts:
#	code/game/objects/structures/displaycase.dm
 2015-09-15 14:08:36 -07:00
Markolie
914b3742ed Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lawstate 2015-09-15 23:06:56 +02:00
Markolie
5e856a0aaf Law manager channel fixes 2015-09-15 23:02:04 +02:00
Tigercat2000
0603f73232 Bay12 examine overhaul. 
This commit overhauls the examine system to baystation's latest system,
including a more efficient verb approach, and a new status panel tab,
which shows more information for pre-defined objects.
 2015-09-14 11:51:40 -07:00
Markolie
ca6c7d10ba In hand sprite overhaul 2015-09-13 22:44:18 +02:00
Markolie
d5a3fb57ea Add cooldown to pAI card/drone reactivations 2015-09-11 06:51:14 +02:00
Mark van Alphen
84b42c5491 Merge pull request #1986 from Fox-McCloud/nuke-and-tator 
Nuke Ops and Traitor Update+Balance
 2015-09-10 02:24:32 +02:00
Fox-McCloud
5b160f78f4 topic-fixup 2015-09-09 17:49:27 -04:00
Fox-McCloud
d70c166109 Rad Laser Fix 2015-09-09 17:00:53 -04:00
Fox-McCloud
71f6b312d8 tweak 2015-09-08 22:01:05 -04:00
Fox-McCloud
1c6c733a52 Nuke Ops and Traitor Update+Balance 2015-09-08 19:38:30 -04:00
Fox-McCloud
95cea49702 oops 2015-09-04 22:56:52 -04:00
Fox-McCloud
64b2bb3784 Merge remote-tracking branch 'upstream/master' into material-datums 2015-09-04 22:53:20 -04:00
Markolie
94bb785282 Final intercom fixes 2015-09-05 02:42:19 +02:00
Markolie
368124a7e6 Main map intercom updates 2015-09-05 02:27:20 +02:00
Fox-McCloud
ea6bfdf758 upgradeable recycler 2015-09-04 19:41:42 -04:00
Markolie
281f5a9640 Intercom update 2015-09-05 01:38:34 +02:00
Markolie
26d0ad3071 Radio access update 2015-09-04 19:29:56 +02:00
Fox-McCloud
a019934e9e Pass I 2015-09-04 05:18:48 -04:00
Markolie
3a3457de36 Port Bay's intercom overhaul 2015-09-03 21:21:20 +02:00
Fox-McCloud
9695509908 Merge pull request #1919 from tigercat2000/funlittletgthings 
Progress bars
 2015-09-01 16:45:10 -04:00
Tigercat2000
7f4ac72910 Progress bars + Wall Rationalization 
This commit does the following:
 - Ports progress bars from -tg- (tgstation/-tg-station#9921)
 - Refactors wall attackby code to make it 100% less insane; Instead of
   manually checking every little thing, it uses do_after,
   consequentially, making the new progress bars affect dealing with walls
   as well.

Wall code makes a tiger sad.
 2015-08-31 13:38:51 -07:00
Markolie
b999ca32b8 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lawmanager 
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
 2015-08-31 02:23:24 +02:00
Markolie
5dc034719d Port Bay's silicon law manager 2015-08-31 02:18:49 +02:00
Markolie
0e0cc0af50 Ghost interaction update, voice changer fix, man up global confirmation 2015-08-27 15:33:33 +02:00
Fox-McCloud
7c59d1ce69 Merge pull request #1836 from Markolie/power 
Power monitor update
 2015-08-24 21:25:06 -04:00
Mark van Alphen
b6a504c756 Merge pull request #1826 from FalseIncarnate/Sushi 
Sushi Update
 2015-08-24 19:28:50 +02:00
Markolie
93c52de1f9 Power monitor update 2015-08-23 23:58:38 +02:00