 Markolie
|
9c54d2feaa
|
Central Command access rework
|
2015-03-04 16:36:17 +01:00 |
|
|
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 |
|
|
Markolie
|
afac549c39
|
Revert economy changes, quarantine law fix
|
2015-02-02 20:02:29 +01:00 |
|
|
ZomgPonies
|
b5e66de4c3
|
Econ Phase 1 Bugfix: Fixes people with random names spawning with no ID
|
2015-01-31 17:15:51 -05:00 |
|
|
ZomgPonies
|
ae02ebb446
|
Economy Changes Phase 1
|
2015-01-30 23:59:27 -05:00 |
|
|
Mark Aherne
|
9b45dbabfb
|
Continued work in progress on a major revision of the NanoUI templating system.
Conflicts:
code/ATMOSPHERICS/components/omni_devices/filter.dm
code/ATMOSPHERICS/components/omni_devices/mixer.dm
code/game/dna/dna_modifier.dm
code/game/machinery/cryo.dm
code/game/machinery/kitchen/smartfridge.dm
code/modules/nano/nanoexternal.dm
code/modules/nano/nanomanager.dm
code/modules/nano/nanoui.dm
code/modules/power/apc.dm
code/modules/power/smes.dm
code/modules/reagents/Chemistry-Machinery.dm
nano/css/shared.css
nano/js/nano_update.js
nano/templates/escape_pod_console.tmpl
|
2014-07-15 07:22:15 -04:00 |
|
|
ZomgPonies
|
0b2fd89f55
|
Hopefully fix vending machines
|
2014-05-24 13:49:21 -04:00 |
|
|
ZomgPonies
|
408379ab6a
|
vg economy overhaul
|
2014-05-20 22:51:02 -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 |
|
|
ZomgPonies
|
3273ab1418
|
Econ and hud fixes
|
2013-11-25 06:12:56 -05:00 |
|