cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-02 05:32:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,905 Commits 26 Branches 2 Tags
25d06864e077522b9e36498cde5edbaf520cb7ae
Commit Graph

861 Commits

Author SHA1 Message Date
TheDZD
de8e5ecfd0 Merge pull request #2254 from Markolie/swordnborg 
Syndicate borg update, add medical syndicate borg, energy sword refactor
 2015-10-02 15:49:57 -04:00
Markolie
f052512578 Fixes 2015-10-02 01:34:37 +02:00
Markolie
d18b18b5b4 Syndicate borg update, add medical syndicate borg, energy sword refactor 2015-10-01 04:21:24 +02:00
Fox McCloud
f000c0c225 Merge pull request #2238 from Markolie/emotes 
Add cooldown to chirp emote, dsay fix
 2015-09-29 22:37:31 -04:00
Markolie
1a7c565482 Fix 2015-09-30 03:38:44 +02:00
Markolie
9277a2f55e Dsay fix 2015-09-30 03:35:30 +02:00
TheDZD
d84868d43f Merge pull request #2229 from Markolie/hotkey 
Admin PM fix
 2015-09-29 20:25:56 -04:00
Markolie
f7c2685122 Admin PM fix 2015-09-30 00:21:55 +02:00
Fox-McCloud
933ffcd7d0 Merge pull request #2197 from Markolie/stickyban 
Add in-game stickyban interface
 2015-09-28 03:20:37 -04:00
Markolie
6b7d8914d9 Admin messaging for proc calls 2015-09-28 01:44:18 +02:00
Markolie
273bcb07e5 Add vial box to virology, in view() update 2015-09-28 01:18:04 +02:00
Markolie
44763a869a Stickyban clean-up, add admin bans 2015-09-27 23:58:10 +02:00
Markolie
6f2a753d89 Send questions to admins and mods 2015-09-27 21:38:08 +02:00
Markolie
91eaf81a08 Fix 2015-09-27 03:18:05 +02:00
Markolie
6e19e36d9b More admin logging 2015-09-27 03:07:06 +02:00
Markolie
4bd97b9943 Set default to world.view 2015-09-25 18:36:01 +02:00
Markolie
ce9545525c Varedit right checks update 2015-09-25 18:33:51 +02:00
Markolie
24337913cd Add SDQL, +PROCCALL, admin updates 2015-09-25 16:54:27 +02:00
Markolie
1a2459de0a check_rights/R_MOD update 2015-09-24 04:35:04 +02:00
Markolie
d47c256cd7 Close spawn tag 2015-09-23 21:19:21 +02:00
Markolie
14f64b2b24 Fixes for Vox/Plasmamen highlanders/dodgeball players 2015-09-23 21:17:40 +02: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
bec9fca533 SQL update 2015-09-23 06:13:42 +02:00
Markolie
551d4e8988 Admin jump window fix 2015-09-23 02:51:59 +02:00
Markolie
279c998ae8 OOC/LOOC update, stealthmin fixes 2015-09-17 21:27:24 +02:00
Markolie
90f722d752 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into intercom 
Conflicts:
	code/modules/projectiles/guns/projectile/automatic.dm
	icons/mob/back.dmi
 2015-09-15 04:18:27 +02:00
Fox-McCloud
6fd7350746 Merge pull request #2040 from Markolie/guns 
Guns update
 2015-09-14 22:11:33 -04:00
Markolie
0c991f7092 Nuke code admin check fix 2015-09-14 22:13:18 +02:00
Markolie
f41f0a59fe Guns update 2015-09-14 04:05:20 +02:00
Markolie
ca6c7d10ba In hand sprite overhaul 2015-09-13 22:44:18 +02:00
Regen
5a87bfd41e Move verb to debug 2015-09-09 16:52:35 +02:00
Regen
009909650c Adds cinematic verb 
This will add the cinematic verb to the Event panel, will work like a
normal nuke / AI override, meaning it will kill everyone (ending the
round)
 2015-09-07 12:11:45 +02:00
Fox-McCloud
d829e7003a Merge pull request #1913 from Markolie/lawmanager 
Port Bay's silicon law manager
 2015-09-01 16:41:55 -04:00
Fox-McCloud
0e5b6fb1fa Merge pull request #1918 from Markolie/fixes2 
Fixes
 2015-08-31 17:37:27 -04:00
Fox-McCloud
57a9fdcc59 Merge pull request #1910 from Markolie/syndistamp 
Syndistamp
 2015-08-31 17:15:01 -04:00
Markolie
4c798a014e Update ERT leader name 2015-08-31 20:10:49 +02: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
1cc4f7f483 Add syndicate stamp 2015-08-30 22:52:31 +02:00
TheDZD
0904f16ed8 Merge pull request #1871 from Markolie/watchlist 
Watchlist/admin updates
 2015-08-30 14:43:43 -04:00
Markolie
2787c2fd46 sortAtom improvements 2015-08-28 23:52:27 +02:00
Markolie
529205ccb2 Watchlist/admin updates 2015-08-27 16:22:40 +02:00
Fox-McCloud
ea119a98df Merge pull request #1811 from Markolie/DENIED 
Add option to reject adminhelps
 2015-08-22 16:06:58 -04:00
Markolie
e6c331153a Add option to reject adminhelps 2015-08-20 23:33:09 +02:00
Markolie
93e320c648 Add mob sprites to ERT backpacks 2015-08-20 19:33:35 +02:00
Fox-McCloud
1f7bfe92be Merge pull request #1781 from Markolie/adminbus 
Admin teleport update, further admin message fixes
 2015-08-18 20:19:55 -04:00
Markolie
4e8bb6d301 Admin teleport update, further admin message fixes 2015-08-18 00:54:25 +02:00
Fox-McCloud
333e7fe236 Merge pull request #1766 from Markolie/adminbus 
Admin jump overhaul, add watchlist functionality, other admin updates
 2015-08-17 18:10:38 -04:00
Fox-McCloud
6d9e64b42b Merge pull request #1775 from Markolie/cult 
Cult loyalty implant fix, other fixes
 2015-08-17 17:12:46 -04:00
Markolie
c91e698e24 Fix shuttle call sanitization 2015-08-17 21:20:00 +02:00