cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-26 18:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,374 Commits 26 Branches 2 Tags
c5626800983a18bf3b38915952e3421488d30139
Commit Graph

1570 Commits

Author SHA1 Message Date
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
84c60aa560 Monkey/human transform fixes 2015-09-14 22:13:32 +02: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
Markolie
7de2086059 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into intercom 2015-09-11 06:14:32 +02:00
Markolie
548bacfc7f Properly add Syndicate stamp to Syndicate faxes 2015-09-11 05:50:53 +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
Regen
da1b734c4b Removes unused adminverb 
VV editing the AI name works just fine
 2015-09-03 23:19:08 +02:00
Fox-McCloud
06ee1a618a Merge pull request #1928 from Markolie/fax 
Fix admin viewing paper bundles
 2015-09-01 17:58:48 -04:00
Markolie
4cde301243 Fix admin viewing paper bundles 2015-09-01 23:47:32 +02:00
Fox-McCloud
2fd18a2410 Merge pull request #1917 from Markolie/byondmembers 
Add BYOND member perks
 2015-09-01 16:42:34 -04:00
Fox-McCloud
2d0f77fa1b Merge pull request #1916 from Markolie/looc 
Reboot improvements, player panel fix, IsBanned fix
 2015-09-01 16:42:09 -04: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
b651eb36ce Give members a predefined OOC color 2015-08-31 19:56:55 +02:00
Markolie
2b109d8400 Add BYOND member perks 2015-08-31 18:52:14 +02:00
Markolie
99764317de Fix restart description 2015-08-31 17:47:58 +02:00
Markolie
ce6ad20cf9 Reboot improvements, player panel fix, IsBanned fix 2015-08-31 17:44:13 +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
Fox-McCloud
1c9da614c4 Merge pull request #1887 from Markolie/performance 
sortAtom removal, performance fixes
 2015-08-29 18:10:30 -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
Markolie
0e0cc0af50 Ghost interaction update, voice changer fix, man up global confirmation 2015-08-27 15:33:33 +02:00
Fox-McCloud
a53451c243 Merge pull request #1813 from TheDZD/muhcheens 
Machine Upgrade Update
 2015-08-23 00:35:18 -04:00
Fox-McCloud
ea119a98df Merge pull request #1811 from Markolie/DENIED 
Add option to reject adminhelps
 2015-08-22 16:06:58 -04:00
Fox-McCloud
76d1493601 Merge pull request #1825 from Markolie/admins 
Readmin fix, antag age update
 2015-08-22 16:03:42 -04:00
Markolie
8ffea8f731 Readmin fix, antag age update 2015-08-22 21:53:51 +02:00
DZD
5ce49bb3b3 Machine Upgrade Update 
- Partial port of tgstation/-tg-station#9813
 2015-08-20 21:03:19 -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
Krausus
f816b8672d Resolves merge conflicts 
Conflicts:
	code/game/machinery/computer/communications.dm
 2015-08-18 04:14:14 -04:00
Krausus
6dc8b850ac Removes "Guests not allowed" admin message 
Informing in-game admins that a guest failed to connect is completely
useless.
 2015-08-18 03:50:33 -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
Fox-McCloud
bef92affd7 Merge pull request #1758 from Markolie/spawnpanel 
Spawn panel improvements
 2015-08-17 16:43:16 -04:00
Markolie
c91e698e24 Fix shuttle call sanitization 2015-08-17 21:20:00 +02:00
Mark van Alphen
33631beaf8 Merge pull request #1740 from tigercat2000/underwear_refactor 
-tg- underware overhaul
 2015-08-17 17:37:50 +02:00
Markolie
dc99702b9d Logging improvements 2015-08-17 16:54:11 +02:00
Markolie
52fbcb9e89 Minor consistency changes 2015-08-17 02:23:34 +02:00
Markolie
5eee617063 Consolidate ?/FLW links under key_name_admin 2015-08-17 00:13:53 +02:00