Commit Graph

1845 Commits

Author SHA1 Message Date
Fox McCloud
559b03bfeb Merge pull request #2297 from Markolie/itemcolor
Replace _color with item_color
2015-10-06 16:11:35 -04:00
Markolie
bff7a9a80c Replace _color with item_color 2015-10-05 19:55:14 +02:00
Markolie
fdc3578582 Turn poll magic strings into defines 2015-10-05 19:25:05 +02:00
Tigercat2000
8c97846746 -tg- style inventory update, stripping update
This commit does the following:
 - Updates a few of our inventory procs to -tg-'s latest
 - Nukes the equip_e system from orbit
 - Fancy UI for stripping people now
 - Nuked fucking kitten ears from their snowflakey bullshit update_icons
   shitty fuck fuck FUCK
 - NUKED FUCKING METAL DETECTORS AHHHHHHHHHHHHHHHHHHHHHHHHHH
2015-10-04 16:53:48 -07:00
Markolie
76db6db28a Better handling 2015-10-05 01:12:01 +02:00
Markolie
de930c24ba Admin panel client fix, goon DNA fix 2015-10-05 01:10:39 +02:00
Markolie
486c64c9c4 Going to keep it in the same meny 2015-10-04 21:42:26 +02:00
Markolie
ad3096c4ec More create poll improvements 2015-10-04 21:40:57 +02:00
Markolie
a5cfb1f45c Create poll fixes from /tg/ 2015-10-04 09:03:44 +02:00
Markolie
69c97863d5 Adminhelp update 2015-10-04 03:11:02 +02:00
TheDZD
8181354ffc Merge pull request #2261 from Markolie/fixesfixesfixesfixesfixesfixes
Fixes
2015-10-02 15:50:23 -04:00
TheDZD
de8e5ecfd0 Merge pull request #2254 from Markolie/swordnborg
Syndicate borg update, add medical syndicate borg, energy sword refactor
2015-10-02 15:49:57 -04:00
Markolie
00fc1dd812 Move up related accounts in the player panel 2015-10-02 04:31:52 +02:00
Markolie
f052512578 Fixes 2015-10-02 01:34:37 +02:00
Markolie
d40cfe582e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into swordnborg
Conflicts:
	icons/obj/surgery.dmi
2015-10-01 04:32:10 +02:00
Markolie
d18b18b5b4 Syndicate borg update, add medical syndicate borg, energy sword refactor 2015-10-01 04:21:24 +02:00
TheDZD
d9f3cae655 Merge pull request #2231 from Markolie/hotkeys2
Hotkey/interface update
2015-09-30 19:40:49 -04:00
Fox McCloud
f000c0c225 Merge pull request #2238 from Markolie/emotes
Add cooldown to chirp emote, dsay fix
2015-09-29 22:37:31 -04:00
Markolie
1a7c565482 Fix 2015-09-30 03:38:44 +02:00
Markolie
9277a2f55e Dsay fix 2015-09-30 03:35:30 +02:00
TheDZD
d84868d43f Merge pull request #2229 from Markolie/hotkey
Admin PM fix
2015-09-29 20:25:56 -04:00
Markolie
a2c05f45d4 Reboot fix 2015-09-30 01:12:31 +02:00
Markolie
8ad7eb56c2 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into hotkeys2
Conflicts:
	config/example/config.txt
2015-09-30 01:04:45 +02:00
Markolie
2f9fd64a55 Hotkey/interface update 2015-09-30 01:02:58 +02:00
Markolie
f7c2685122 Admin PM fix 2015-09-30 00:21:55 +02:00
Fox-McCloud
933ffcd7d0 Merge pull request #2197 from Markolie/stickyban
Add in-game stickyban interface
2015-09-28 03:20:37 -04:00
Markolie
4bcb5d0eb2 Add sorting to stickyban list 2015-09-28 05:58:00 +02:00
Markolie
6b7d8914d9 Admin messaging for proc calls 2015-09-28 01:44:18 +02:00
Markolie
273bcb07e5 Add vial box to virology, in view() update 2015-09-28 01:18:04 +02:00
Markolie
1952d15699 Space fix 2015-09-28 00:44:07 +02:00
Markolie
bd65300965 Formatting update, make sure that reload admins remove proccall verbs 2015-09-28 00:22:35 +02:00
Markolie
44763a869a Stickyban clean-up, add admin bans 2015-09-27 23:58:10 +02:00
Markolie
6f2a753d89 Send questions to admins and mods 2015-09-27 21:38:08 +02:00
Markolie
84f1c2ab8f Re-add ban appeal message, memo check 2015-09-27 09:08:10 +02:00
Markolie
1b14817889 Add in-game stickyban interface 2015-09-27 09:02:58 +02:00
Markolie
ea438c62c7 Let mentors de-admin again 2015-09-27 03:20:34 +02:00
Markolie
91eaf81a08 Fix 2015-09-27 03:18:05 +02:00
Markolie
6e19e36d9b More admin logging 2015-09-27 03:07:06 +02:00
Fox-McCloud
821d2d0309 Merge pull request #2167 from Markolie/SDQL
Add SDQL, +PROCCALL, admin updates
2015-09-26 17:40:03 -04:00
Markolie
e4440525d7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into sql
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
2015-09-26 05:20:05 +02:00
Markolie
4bd97b9943 Set default to world.view 2015-09-25 18:36:01 +02:00
Markolie
ce9545525c Varedit right checks update 2015-09-25 18:33:51 +02:00
Markolie
24337913cd Add SDQL, +PROCCALL, admin updates 2015-09-25 16:54:27 +02:00
Markolie
2452d2e85b Admin logging fixes 2015-09-25 02:32:31 +02:00
Fox-McCloud
15e4256a71 Merge pull request #2147 from tigercat2000/reformat
Admins secret menu reformat
2015-09-24 14:17:47 -04:00
Markolie
172a9df112 Admin fixes 2015-09-24 19:18:26 +02:00
Markolie
1a2459de0a check_rights/R_MOD update 2015-09-24 04:35:04 +02:00
Markolie
fccac25c99 Further logging/right check updates 2015-09-24 04:01:47 +02:00
Markolie
fa0efbf983 Update admin announce, edit memory fix 2015-09-24 03:18:14 +02:00
Markolie
d47c256cd7 Close spawn tag 2015-09-23 21:19:21 +02:00