Commit Graph

2316 Commits

Author SHA1 Message Date
variableundefined
c373185e1e Revert "(TGCRP) - /tg/ catgirl refugee program" 2018-10-27 13:06:42 +08:00
variableundefined
bf7ef076ca Merge pull request #10000 from tigercat2000/literally_catgirls
(TGCRP) - /tg/ catgirl refugee program
2018-10-27 11:00:34 +08:00
Birdtalon
19d805c5f4 changes C to src, removes an unnecessary proc 2018-10-25 18:36:39 +01:00
tigercat2000
8dc88cb80b Closer to working 100% 2018-10-25 01:48:51 -07:00
Purpose
ecb466507e super important 2018-10-21 18:23:55 +01:00
Crazy Lemon
517d7521b4 Merge pull request #9842 from variableundefined/ListFreeSlotNoLie
Improve list free slots admin command
2018-10-20 16:37:14 -07:00
Mark Mak
4bc1a1c1ef Merge pull request #9363 from MarsM0nd/Refactor_UID
Href refactor: macros and playerpanel
2018-10-19 07:46:42 +08:00
variableundefined
8648734e7e Formatting 2018-10-15 08:11:30 +08:00
variableundefined
7f5fc850fd Close some span tags 2018-10-14 19:29:29 +08:00
variableundefined
5d9a53a57e Improve list free slots admin command 2018-10-14 12:34:28 +08:00
alex-gh
af0b6670f0 Fixes runtime in IsBanned.dm 2018-10-14 04:34:00 +02:00
Mars
984339ce42 Merge-conflict fix + check for null rather than type. 2018-10-12 18:59:54 +02:00
Desolate
46dd98f4e0 oops 2018-10-11 16:26:06 -05:00
Desolate
f7627d2fcb Resolves conflicts. 2018-10-11 05:36:22 -05:00
Mars
e0ab0e5af0 Wrong varname to get the ticket counter 2018-10-09 09:53:35 +02:00
Mars
d9b60a7bfb Fix merge conflict 2018-10-09 09:41:37 +02:00
variableundefined
c2bf480622 Merge pull request #9631 from Birdtalon/ERT-changes
Gamma ERT Changes
2018-10-09 08:58:15 +08:00
variableundefined
0ea649958b Merge pull request #9291 from Crazylemon64/buildmode_refactor
Refactors buildmode into submodules, and adds an "atmos" buildmode
2018-10-08 12:12:33 +08:00
Crazy Lemon
200efd05bd Merge pull request #9459 from variableundefined/NPCPoolPort
SS Port: NPCAI & NPCPool
2018-10-07 21:01:30 -07:00
Crazylemon64
5b0eedcee5 Refactors buildmode into submodules, and adds an "atmos" buildmode
Also makes the mode selection interface far less tedious/painful

Adds unsimulated turf overriding, and admin logging

Temporary commit for storing the sdql buildmode

Adds extra documentation

also requires a path to be selected for "advanced" and "fill" modes, now

Spaces out mode switch buttons nicer

removes need for debug rights to do a fill with mob paths

Adds a bunch of extra fancy paths

Fox Changes pt 1

Backports /tg/station changes

Fixes a double-tap issue with dclick handling of certain mobs

Also no longer shows the "selection canceled" if you haven't selected a
region for the buildmode that supports region selection

Updates buildmode stuff
2018-10-07 20:54:40 -07: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
721a7656d2 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into NPCPoolPort 2018-10-01 16:34:47 +08: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
Crazy Lemon
ca26739109 Merge pull request #9477 from variableundefined/SSPortShuttle
Port Shuttle to StonedMC
2018-10-01 01:13:42 -07:00
Birdtalon
1628467857 Merge branch 'master' into ERT-changes
# Conflicts:
#	icons/mob/head.dmi
2018-09-30 14:53:32 +01:00
variableundefined
3f3194598d Merge pull request #9642 from SamHPurp/span-span-span-span
Fixes a bunch of message formatting overflows
2018-09-30 08:30:49 +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
Purpose
6cb07cb70c Fixes a bunch of shown messages 2018-09-29 19:10:10 +01:00
variableundefined
f67fabd082 I am a genius 2018-09-29 21:37:15 +08:00
Crazy Lemon
1bdf3cc38d Merge pull request #9628 from variableundefined/GearSpawn
Stop you from losing your memory and money at roundstart
2018-09-28 09:15:50 -07:00
variableundefined
35342aa4cb Actually follow up with assignrank 2018-09-28 18:37:07 +08:00
Birdtalon
ffe2b5f27a adds additional check for protected jobs in one-click-antag 2018-09-22 17:50:24 +01:00
variableundefined
7f32200f78 Fixes special char being allowed in some name 2018-09-11 13:33:39 +08:00
Crazy Lemon
cacd50a2e8 Merge pull request #9359 from Aurorablade/Formatting
Formats the HM in player panel
2018-09-04 09:22:10 -07:00
variableundefined
bc22544919 Port Shuttle to StonedMC 2018-09-02 22:22:33 +08:00
variableundefined
1e8e909847 Actually port it over properly. Also port NPCAI to StonedMC. 2018-09-01 11:31:42 +08:00
Birdtalon
f91e14c240 adds stat entry, removes unused proc 2018-08-28 19:30:20 +01:00
Birdtalon
fb14cdb6b7 makes procs use clients again 2018-08-28 19:17:42 +01:00
Mars
f2532e74ba Merge conflict fix 2018-08-28 11:28:13 +02:00
Unknown
dc0df1df66 fixes admin prison 2018-08-28 10:39:06 +02:00
Crazy Lemon
a94375bcb2 Merge pull request #9366 from variableundefined/LogPrayer
Add logging to prayer
2018-08-27 18:37:17 -07:00
Birdtalon
d9d48e8464 fixes 2018-08-26 15:50:50 +01:00
Birdtalon
ee908a9554 refactors admin tickets system to subsystem 2018-08-26 15:15:25 +01:00
variableundefined
37d0056e0f Fixes a runtime with admin ticket 2018-08-19 13:37:54 +08: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
4fa906951a Use of the flexible macro
Mostly regex to catch every \ref with the same formatting, with their
reference and display name.
2018-08-16 20:04:53 +02:00