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
variableundefined
d34841ca63
Merge pull request #9138 from tigercat2000/NTSL2
...
NTSL2
2018-11-15 17:58:27 +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
tigercat2000
e5d1ecb6a4
Merge remote-tracking branch 'upstream/master' into updateicons
2018-11-08 20:24:48 -08:00
tigercat2000
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
variableundefined
1a388848bf
Merge pull request #10074 from tigercat2000/mechastuff
...
/tg/ Mecha - Part 2, Action Buttons!
2018-11-08 13:12:41 +08:00
Squirgenheimer
47fb8715a1
adds skip_antag check to one_click_antag
2018-11-06 23:51:45 -05:00
tigercat2000
5c00ac86b6
Add admin logs to NTSL2, change font to Verdana
2018-11-06 09:57:33 -08:00
Ty-Omaha
eef502bebf
spacing
2018-11-06 11:07:25 -05:00
tigercat2000
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
R1f72r
f27f51065e
This should work
2018-11-04 11:15:57 -05:00
tigercat2000
6028fc83c3
Not quite done yet
2018-10-30 22:57:42 -07:00
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
Aurorablade
958c72171b
Globing the player list for cluwnes
2018-10-23 18:18:17 -04:00
Aurorablade
8412befde2
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Arntyougoingtosayhello
2018-10-23 18:17:32 -04: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
