cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-26 18:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,167 Commits 26 Branches 2 Tags
e69c74259aa46704ff7e8ea9f53e2ffef87fa222
Commit Graph

2363 Commits

Author SHA1 Message Date
datlo
61c0f71cce Replaces uplink management by automated sharing 
Various admin outfits changes
Add internal box to honk brand infiltration kit
Add fifty TC stack buyable by nukies
Add subtypes of uplinks : Traitor, Nuclear, SIT, SST, Admin, only
checked by auto sharing for now
 2019-01-03 16:29:31 +00:00
datlo
b0f60602a8 MERGE SHIT REEEEE IMMAH PUNCH A WALL 2018-12-18 11:47:29 +00:00
datlo
0d62b7d07c Syndicate office functional, fix CC mech chargers 2018-12-07 14:45:52 +00:00
datlo
19e5271249 Added syndicate officer as a job proper 2018-12-07 11:07:49 +00:00
datlo
2a7b6d7a49 rename base and make blast doors robust 2018-12-07 09:29:07 +00:00
Citinited
4e9409a097 oops 2018-12-03 17:22:46 +00:00
Citinited
decdac4426 Better loop handling 2018-12-01 19:55:17 +00:00
Citinited
5d5c17492f Fixes some issues in floor cluwne code 2018-12-01 16:18:04 +00:00
Kyep
37b3584c9e fixes to event pets 2018-11-30 18:47:46 -08:00
Kyep
b4acc30b2e removes alignment system 2018-11-28 19:23:26 -08:00
Kyep
c5a4abeb8b changes alignments to light/neutral/dark, removes atheism 2018-11-27 17:34:10 -08:00
Kyep
e2c8614456 always show blessed count to admins when chaplain prays 2018-11-26 17:07:34 -08:00
Kyep
3256ed83e3 updates based on feedback, mostly Tay's 2018-11-24 19:30:39 -08:00
Kyep
b50016891e removes all spells but bless, fixes bugs, adds holy torch 2018-11-24 14:07:21 -08:00
Kyep
b139af2bdd v1 2018-11-23 20:08:49 -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
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