d34841ca63
Merge pull request #9138 from tigercat2000/NTSL2
...
NTSL2
2018-11-15 17:58:27 +08:00
3c9b63e875
mark obj targets, despawn_occupant
2018-11-13 20:44:21 -08:00
e5d1ecb6a4
Merge remote-tracking branch 'upstream/master' into updateicons
2018-11-08 20:24:48 -08:00
ab032b6737
SSoverlays for human icons, mostly works
...
Closer to working 100%
But legitimately /tg/ icons
Move lighting to it's own plane, fix observers
Fix humans layering over other objects incorrectly
Nyaaaaa~
2018-11-08 20:24:22 -08:00
1a388848bf
Merge pull request #10074 from tigercat2000/mechastuff
...
/tg/ Mecha - Part 2, Action Buttons!
2018-11-08 13:12:41 +08:00
47fb8715a1
adds skip_antag check to one_click_antag
2018-11-06 23:51:45 -05:00
eef502bebf
spacing
2018-11-06 11:07:25 -05:00
0a289875ce
Merge remote-tracking branch 'upstream/master' into NTSL2
...
# Conflicts:
# code/game/machinery/telecomms/traffic_control.dm
# code/modules/admin/verbs/randomverbs.dm
# code/modules/scripting/Implementations/Telecomms.dm
2018-11-05 15:16:07 -08:00
6028fc83c3
Not quite done yet
2018-10-30 22:57:42 -07:00
c373185e1e
Revert "(TGCRP) - /tg/ catgirl refugee program"
2018-10-27 13:06:42 +08:00
bf7ef076ca
Merge pull request #10000 from tigercat2000/literally_catgirls
...
(TGCRP) - /tg/ catgirl refugee program
2018-10-27 11:00:34 +08:00
19d805c5f4
changes C to src, removes an unnecessary proc
2018-10-25 18:36:39 +01:00
8dc88cb80b
Closer to working 100%
2018-10-25 01:48:51 -07:00
958c72171b
Globing the player list for cluwnes
2018-10-23 18:18:17 -04:00
8412befde2
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Arntyougoingtosayhello
2018-10-23 18:17:32 -04:00
ecb466507e
super important
2018-10-21 18:23:55 +01:00
517d7521b4
Merge pull request #9842 from variableundefined/ListFreeSlotNoLie
...
Improve list free slots admin command
2018-10-20 16:37:14 -07:00
8648734e7e
Formatting
2018-10-15 08:11:30 +08:00
7f5fc850fd
Close some span tags
2018-10-14 19:29:29 +08:00
5d9a53a57e
Improve list free slots admin command
2018-10-14 12:34:28 +08:00
984339ce42
Merge-conflict fix + check for null rather than type.
2018-10-12 18:59:54 +02:00
f7627d2fcb
Resolves conflicts.
2018-10-11 05:36:22 -05:00
e0ab0e5af0
Wrong varname to get the ticket counter
2018-10-09 09:53:35 +02:00
d9b60a7bfb
Fix merge conflict
2018-10-09 09:41:37 +02:00
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
4c062212ab
refactors global lists.
2018-10-06 08:02:45 -05:00
c974e29a3c
global lists global defined
2018-10-02 15:52:46 -05:00
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
ca26739109
Merge pull request #9477 from variableundefined/SSPortShuttle
...
Port Shuttle to StonedMC
2018-10-01 01:13:42 -07:00
f67fabd082
I am a genius
2018-09-29 21:37:15 +08:00
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
35342aa4cb
Actually follow up with assignrank
2018-09-28 18:37:07 +08:00
ffe2b5f27a
adds additional check for protected jobs in one-click-antag
2018-09-22 17:50:24 +01:00
7f32200f78
Fixes special char being allowed in some name
2018-09-11 13:33:39 +08:00
bc22544919
Port Shuttle to StonedMC
2018-09-02 22:22:33 +08:00
fb14cdb6b7
makes procs use clients again
2018-08-28 19:17:42 +01:00
f2532e74ba
Merge conflict fix
2018-08-28 11:28:13 +02:00
a94375bcb2
Merge pull request #9366 from variableundefined/LogPrayer
...
Add logging to prayer
2018-08-27 18:37:17 -07:00
d9d48e8464
fixes
2018-08-26 15:50:50 +01:00
ee908a9554
refactors admin tickets system to subsystem
2018-08-26 15:15:25 +01:00
bedaad976f
Ensure admin\topic.dm uses mostly locateUID
2018-08-17 20:06:22 +02:00
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
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
903eaf952b
Add prayer to logg
2018-08-16 19:52:32 +08:00
b5b09b435c
No hard-coded format in the macros anymore
2018-08-16 11:51:52 +02:00
e8d92b3ced
More flexible macro
2018-08-16 11:37:03 +02:00
4d3c3b29e4
Quick Regex replace action
...
Used Regex to replace all hrefs with \ref and the same displayed text
with the corresponding UID macros
2018-08-15 23:57:46 +02:00
218aa2402d
Macro usage
2018-08-15 22:27:53 +02:00
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
40e43922df
Tweaks
2018-08-07 02:11:36 -04:00
variableundefined