Commit Graph

94 Commits

Author SHA1 Message Date
mwerezak
a54ef207a1 Reworks shuttles to be more extensible
Kudos to Zuhayr for laying the groundwork for this.

Conflicts:
	code/controllers/master_controller.dm
	code/modules/shuttles/shuttle.dm
2014-06-14 04:13:34 -04:00
mwerezak
e9171a9ae3 Adds docking support to shuttles, NanoUI
Conflicts:
	code/game/machinery/doors/airlock.dm
	code/game/machinery/doors/airlock_control.dm
	code/game/machinery/embedded_controller/docking_program.dm
	code/modules/shuttles/shuttle.dm
	nano/css/shared.css
2014-06-14 04:10:39 -04:00
mwerezak
629c14a66c Adds support for different shuttle states
Also cleans up shuttle move states a bit.
Moves shuttle_console to it's own file

Conflicts:
	code/modules/shuttles/shuttle.dm
2014-06-14 04:04:36 -04:00
Zuhayr
4385b1320c Moved the Vox skipjack console over to a multi-destination shuttle datum setup.
Conflicts:
	baystation12.dme
	code/game/gamemodes/vox/heist/heist.dm
	code/game/machinery/computer/vox_shuttle.dm
2014-06-14 02:22:11 -04:00
Zuhayr
7c442ac9a3 Added a 'controller' for shuttles (really just a data container), fixed up the admin shuttle verbs into one general verb, changed shuttles to use controller instead of populating lists at spawn.
Conflicts:
	code/controllers/master_controller.dm
	code/modules/admin/admin.dm
2014-06-14 02:10:10 -04:00
Zuhayr
689110af1d Some cleanup stuff for prior commits. 2014-06-14 02:01:58 -04:00
Zuhayr
e4b95aa05e Moved engineering, research and mining shuttles to a generalized system with its own directory structure.
Conflicts:
	baystation12.dme
	code/modules/mining/mine_items.dm
	code/modules/research/research_shuttle.dm
2014-06-14 02:01:14 -04:00
Mloc-Argent
1b2f83dee4 BS12 Hooks 2014-05-22 23:56:35 +02:00
ZomgPonies
342f8c4042 Fixed up Highlander and Dodgeball 2014-05-22 14:21:29 -04:00
jack-fractal
05da6ed973 adding modifications to cult mode, working spirits, and mask transformation procs
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/modules/mob/mob.dm
	code/modules/mob/mob_movement.dm
2014-05-15 05:16:13 -04:00
Jeremy Liberman
bd249e3a53 Mutiny Mode
Conflicts:
	code/__HELPERS/time.dm
	code/controllers/hooks-defs.dm
	code/controllers/hooks.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/podmen.dm
	code/modules/admin/player_panel.dm
	code/modules/client/preferences.dm
	code/modules/mob/living/carbon/brain/brain_item.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/login.dm
	code/modules/mob/mob.dm
	code/modules/security levels/keycard authentication.dm
	code/setup.dm
	icons/mob/mob.dmi
2014-05-15 01:01:54 -04:00
SamCroswell
f4ef7c192b Map changes, new Ninja masks
Map changes including: RnD layout change, new customs lounge, xenoarch
windows fix, and more. Also added a few new Ninja masks in prep for some
bigger changes I have planned.
2014-05-03 18:35:10 -04:00
ZomgPonies
41adcc57cd Jobbans for karma jobs! 2014-04-29 17:05:20 -04:00
Jordie0608
7ab1aac59e Outright removed toggle admin jump,spawn and revive buttons
Conflicts:
	code/controllers/configuration.dm
	code/modules/admin/admin_verbs.dm
	code/modules/admin/topic.dm
2014-01-31 02:47:04 -05:00
Rob Nelson
6091d16262 DNA panel fixed, update changelog.
Conflicts:
	html/changelog.html
2014-01-20 11:43:07 -05:00
Rob Nelson
dae08eb061 Add back in /fail/station's DNA dickery panel, fix missing block shifting.
Conflicts:
	code/modules/admin/verbs/debug.dm
2014-01-20 01:03:42 -05:00
ZomgPonies
65d023dd93 Facehugger to Full alien, all player controlled 2014-01-19 16:45:20 -05:00
YotaXP
b7efb1b7ed Optimized and refactored list2text, text2list, and replacetext.
Also fixed some grammar in the station blueprint code.

Conflicts:
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/modules/admin/verbs/debug.dm
	code/modules/clothing/masks/gasmask.dm
	code/modules/detectivework/scanner.dm
	code/modules/flufftext/TextFilters.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/silicon/ai/say.dm

Conflicts:
	code/modules/admin/verbs/debug.dm
	code/modules/detectivework/scanner.dm
2014-01-08 07:14:16 -05:00
ZomgPonies
62b0b49659 Brain Borer Overhaul 2013-12-19 03:32:19 -05:00
ZomgPonies
ecaaec5257 Magic Overhaul Part Deux 2013-12-18 02:30:55 -05:00
Regen1
5224244268 Added Syndicate strike team to secrets panel
Also removed the Dsay "BADMIN" and changed it to just "ADMIN"
2013-12-03 21:43:10 +01:00
alex-gh
9ebee104db Replaced some of the legacy events in the admin menu with a non-legacy events 2013-12-02 15:42:50 +01:00
ZomgPonies
f60b0e610b AntagHUD for admins and ghosts (who cannot respawn) 2013-11-30 06:39:04 -05:00
ZomgPonies
506c3f8c00 Added nymphs and ERT to jobban list 2013-11-30 05:57:50 -05:00
ZomgPonies
348faebe7c Pretty much finished new sec levels Yay 2013-11-26 14:36:36 -05:00
ZomgPonies
579e8c1344 Admin secret menu overhaul 2013-11-25 07:46:52 -05:00
ZomgPonies
5e00673238 First commit 2013-11-24 23:47:28 -05:00
ZomgPonies
29114f7bb3 Added appearance bans granularity option 2013-11-24 02:47:56 -05:00
ZomgPonies
0e201cc4a5 Going back to BS12 ZAS, permanently 2013-11-08 09:51:22 -05:00
ZomgPonies
0227baa319 Reverting ZAS back to /vg/ style 2013-11-07 07:13:27 -05:00
ZomgPonies
e4a82dfda8 ZAS switched from /vg/ to BS12 2013-11-06 20:21:59 -05:00
alex-gh
5fc1bc11ae Vent clog event can now manually triggered 2013-11-03 15:33:12 +01:00
ZomgPonies
4630518535 Player menu overhaul! 2013-11-01 08:17:05 -04:00
ZomgPonies
7b3f4dad39 Radiation storm fixes 2013-10-29 01:28:42 -04:00
ZomgPonies
5daf979b72 Pretty much all new click code 2013-10-12 14:44:36 -04:00
ZomgPonies
bf57879355 Fix unban panel type 2013-09-28 20:43:33 -04:00
ZomgPonies
2ffdf37166 Overhaul of random events 2013-09-25 23:22:32 -04:00
ZomgPonies
6b90da203f Updates Fax code and added sprite 2013-09-24 20:11:19 -04:00
ZomgPonies
ca6abbd923 Fix spider and carp infestation secret 2013-09-19 16:22:22 -04:00
ZomgPonies
9580552fd3 Re-added ninjas 2013-09-16 22:34:28 -04:00
ZomgPonies
640e38ce23 Massive code fix to get the codebase ready to compile in BYOND 500 2013-09-15 23:58:16 -04:00
ZomgPonies
c1a9bfc355 HONKsquad added 2013-09-12 15:44:12 -04:00
ZomgPonies
9827f7d02f HONKputer itself, first iteration 2013-09-11 23:01:49 -04:00
ZomgPonies
a935863200 Made blob gamemode work, removed ninjas because needs overhaul, optimized some strings 2013-09-08 11:39:33 -04:00
ZomgPonies
d2d7104703 Added fax machine to IA office 2013-09-07 21:01:43 -04:00
ZomgPonies
b3f5923ade Trying out new ZAS system 2013-09-07 09:22:51 -04:00
ZomgPonies
2883d73025 DB ban code fix redux 2013-09-06 17:48:27 -04:00
ZomgPonies
ac0ddde997 Updated DB ban code 2013-09-06 08:58:57 -04:00
Erthilo
070cb50f8d PDAs can be used when buckled (and not in any other way restrained or stunned). Rejuvenate now completely heals a target or broken organs and viruses too. 2013-08-11 17:13:58 +01:00
Mloc-Argent
75c8f6d76a Merge branch 'BEF-staging' 2013-07-08 23:28:22 +01:00