cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-06-06 22:13:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
48,775 Commits 15 Branches 2 Tags
4cc30536605ba8dcafe31e6a9be9d0e40e6091c8
Commit Graph

487 Commits

Author SHA1 Message Date
Mark van Alphen 0f98a95666 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/mob/actions/actions.dmi
#	paradise.dme
 2019-05-13 22:14:38 +02:00
AffectedArc07 ec790efeaa SSticker 2019-04-30 16:47:47 +01:00
Mark van Alphen 7fef96e38d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	paradise.dme
 2019-04-21 23:27:23 +02:00
Mark van Alphen 6faf9c769f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
#	paradise.dme
 2019-04-17 22:46:43 +02:00
AffectedArc07 52dff88bd9 Die monster! You don't belong in this world! 2019-04-17 16:30:43 +01:00
variableundefined eb83a2dee7 Merge pull request #11285 from Fox-McCloud/elecrocution-refactor 
Refactors Electrocution
 2019-04-16 19:47:42 +08:00
Kyep 2726324dfa removes non-IP ban option for legacy bans, because DB bans won't honor it regardless 2019-04-13 12:51:34 -07:00
Fox McCloud 90c9f3f479 Refacors Electrocution 2019-04-10 18:09:14 -04:00
Mark van Alphen f94796c125 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/game/objects/items.dm
#	icons/turf/floors/plating.dmi
#	paradise.dme
 2019-04-10 21:54:54 +02:00
farie82 9034f2a214 Merge branch 'master' into mhelp-ticket-system 2019-04-07 14:43:49 +02:00
Mark van Alphen a21ec0f30b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
 2019-04-04 22:04:55 +02:00
Mark van Alphen a05b37c5ca General Lavaland fixes, add Hierophant ruin 2019-03-31 01:12:10 +01:00
Fox McCloud 41eb7c2476 adminbus 2019-03-30 05:15:47 -04:00
joep van der velden 842615cd5b Fixed an ahelp follow up bug. Works now 2019-03-09 22:20:19 +01:00
joep van der velden 8d6cee7915 in between 2019-03-09 20:57:59 +01:00
AffectedArc07 40ba27b871 Adds an admin panel to force unlnik discord accounts 2019-02-10 12:21:30 +00:00
Aurorablade 4fc35a68b1 Gonna have to clean some files after this. 2019-01-19 22:38:47 -05:00
Kyep 37b3584c9e fixes to event pets 2018-11-30 18:47:46 -08:00
Kyep de0840ff5e adds shamebrero smite 2018-11-17 17:36:55 -08:00
Kyep b49772ec59 deletes assassin, lynch 2018-11-16 23:15:34 -08:00
Kyep c58691934e fixes merge conflict with floorcluwne/admin topic.dm 2018-11-16 23:08:09 -08:00
Kyep 3a3fb9503a fixes cold nolog, noclone to cluwne 2018-11-16 23:04:49 -08:00
variableundefined 3ae6856d61 Merge pull request #8684 from Aurorablade/Arntyougoingtosayhello 
Adds FloorCluwnes so you can float too
 2018-11-16 19:28:02 +08:00
variableundefined f27ccc0808 Merge pull request #10238 from Kyep/cryotool_update 
Admin SSD tool update
 2018-11-16 11:03:13 +08:00
variableundefined c12b2130ef Merge pull request #10236 from Kyep/admin_ban_checks 
Fixes admin ban button failing in rare situations
 2018-11-16 09:44:17 +08:00
Kyep 36856839d3 v1 2018-11-15 14:53:45 -08:00
tigercat2000 9e51b56cbd NTSL2 fixes (ParadiseSS13/Paradise#10232) 2018-11-15 11:03:16 -08:00
Kyep 3c9b63e875 mark obj targets, despawn_occupant 2018-11-13 20:44:21 -08:00
Kyep 079848cccc evilfax/bless update 2018-11-13 18:16:49 -08:00
R1f72r f27f51065e This should work 2018-11-04 11:15:57 -05:00
Aurorablade 8412befde2 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Arntyougoingtosayhello 2018-10-23 18:17:32 -04:00
Mars 984339ce42 Merge-conflict fix + check for null rather than type. 2018-10-12 18:59:54 +02:00
Desolate f7627d2fcb Resolves conflicts. 2018-10-11 05:36:22 -05:00
Mars d9b60a7bfb Fix merge conflict 2018-10-09 09:41:37 +02:00
Birdtalon 074ee967e5 Merge branch 'master' into ERT-changes 2018-10-07 19:22:10 +01:00
Desolate 4c062212ab refactors global lists. 2018-10-06 08:02:45 -05:00
Purpose ea74920535 no no no no cyberiaaaaad 2018-10-05 20:57:41 +01:00
Desolate c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
variableundefined f923a2a48b Merge pull request #9419 from Birdtalon/ticketrefactor 
Tickets 2: The ticketting - Converts tickets to subsystem + extra
 2018-10-01 16:20:46 +08:00
Birdtalon c72561d194 addresses points in Purpose's review. Fixes some spans, replaces some 0,1 with TRUE,FALSE, uses some defines 2018-09-29 20:29:26 +01:00
variableundefined bc22544919 Port Shuttle to StonedMC 2018-09-02 22:22:33 +08:00
Unknown dc0df1df66 fixes admin prison 2018-08-28 10:39:06 +02:00
Birdtalon ee908a9554 refactors admin tickets system to subsystem 2018-08-26 15:15:25 +01:00
Mars bedaad976f Ensure admin\topic.dm uses mostly locateUID 2018-08-17 20:06:22 +02:00
Mars 6a77df8792 UID usage for a number of hrefs. 
There should be only UID usage now for the hrefs: adminmoreinfo,
adminplayerobservefollow, adminplayeropts, vars, subtlemessage, traitor,
BlueSpaceArtillery, CentcommReply, SyndicateReply, adminspawncookie,
priv_msg, revive, follow.
 2018-08-17 12:31:26 +02:00
Mars a5c9cfd1cb Fixes and polishes fax radio replies 
Can use the radio option to reply to faxes again.
Centcomm doesn't reply over radio to syndicate faxes.
Removes unreachable code.
 2018-08-12 12:00:32 +02:00
Aurorablade 40e43922df Tweaks 2018-08-07 02:11:36 -04:00
Aurorablade ddb8093335 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Arntyougoingtosayhello 2018-08-07 01:33:55 -04:00
Aurorablade b81f61ae58 Fixes 2018-08-04 23:27:20 -04:00
Aurorablade e8bb3451db Stop making Late night PRs fethas 2018-08-02 02:22:02 -04:00