Markolie
672305e034
Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things
2015-02-22 22:12:11 +01:00
DZD
4bcdb94a99
Merge with upstream/master
...
Fixes conflicts
2015-02-18 13:41:32 -05:00
Markolie
ad167dc541
Announcement system overhaul, crew monitor system overhaul, add portable crew monitor
2015-02-16 19:03:29 +01:00
DZD
b3a0c9a975
Removes TABLEPASS and FPRINT flags
...
- Also adds ABSTRACT and NODROP flags in preparation for removal of
canremove and abstract vars.
- Sorts some of the setup.dm flags so they're in order.
- Replaces 'flags & 2' in policetape.dm with pass_flags & PASSTABLE,
should have the same effect.
2015-02-10 17:41:37 -05:00
Markolie
bd11c78235
Replace every instance of NanoTrasen with Nanotrasen.
2014-11-29 21:01:29 +01:00
Jeremy Liberman
a4196cb745
Add Vox Heist directive and call shuttle on completion of Directive X
...
Conflicts:
baystation12.dme
code/controllers/emergency_shuttle_controller.dm
code/modules/mob/mob.dm
2014-08-06 23:12:24 +02:00
Jeremy Liberman
b3d3f5df8c
Mutiny fix prereqs for directives
...
Conflicts:
code/game/gamemodes/mutiny/directives/alien_fraud_directive.dm
code/game/gamemodes/mutiny/directives/bluespace_contagion_directive.dm
code/game/gamemodes/mutiny/directives/financial_crisis_directive.dm
code/game/gamemodes/mutiny/directives/ipc_virus_directive.dm
code/game/gamemodes/mutiny/directives/research_to_ripleys_directive.dm
code/game/gamemodes/mutiny/directives/tau_ceti_needs_women_directive.dm
code/game/gamemodes/mutiny/directives/terminations_directive.dm
code/game/gamemodes/mutiny/directives/test_directive.dm
code/modules/mob/mob.dm
code/modules/mob/new_player/new_player.dm
2014-05-25 22:34:39 +02:00
alex-gh
4dc1e5c0b3
Merged latest mutiny fixes.
2014-05-19 19:54:42 +02: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
