cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-28 03:01:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,204 Commits 26 Branches 2 Tags
1eb93cd16cdeb00a4b7b48fb0ec953323ae5d5f5
Commit Graph

370 Commits

Author SHA1 Message Date
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
Fox McCloud
aae5405d03 AGHHHHHHHHHHHHHHHHHHH WHATTT 2018-07-17 04:58:36 -04:00
tigercat2000
f31d79a961 Merge pull request #9064 from Anasari/MoreClickAntag 
One-click antag improvement. Antag-related refactor, memory confirmation & typo fixing
 2018-06-13 18:43:18 -07:00
Anasari
d9d9857f57 Remove redundant src and upper limits 2018-06-14 07:23:40 +08:00
Fox McCloud
5fb13096a2 Merge remote-tracking branch 'upstream/master' into weather-subsystem 
# Conflicts:
#	code/__DEFINES/layers.dm
 2018-06-13 16:56:19 -04:00
Tayyyyyyy
170266d827 More pronouns 2018-05-25 18:34:23 -07:00
tigercat2000
ea44afdebe Merge pull request #9025 from Anasari/BombToInvestigate 
Move bombing list to investigate & improve bomb logging
 2018-05-25 17:58:13 -07:00
Ansari
7cb0b6fafe Add number of antags to create option to some one-click antag. Add make_vampire() function, fixes some typos 2018-05-23 21:13:09 +08:00
Fox McCloud
6cdfe70303 Converts and Updates Weather Subsystem 2018-05-21 00:01:18 -04:00
Ansari
2e870f8038 Remove all instance of bombers. Replace "bomber list" in secrets with "bombs" in investigate. Remove useless clear bomb function. 2018-05-17 23:14:29 +08:00
Fox McCloud
5df7dfdaac Preps the Way for Datumized Antags 2018-05-15 21:55:44 -04:00
Aurorablade
c75e084edf Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Arntyougoingtosayhello 2018-04-29 23:57:52 -04:00
Fox McCloud
8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
Aurorablade
5477ab350e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Arntyougoingtosayhello 2018-04-15 20:08:22 -04:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
Fox McCloud
1d80bf01c0 Merge remote-tracking branch 'upstream/master' into gc-ss-port 
# Conflicts:
#	paradise.dme
 2018-04-03 18:21:04 -04:00
Fox McCloud
7f842e3223 no more runtimes 2018-03-29 00:44:53 -04:00
tigercat2000
affc986684 Fix time shit & Add secrets verb 2018-03-26 20:16:22 -07:00