 Markolie
|
09321d6c0b
|
Use station_name proc where possible, mapfix
|
2015-01-21 23:37:05 +01:00 |
|
|
Fox-McCloud
|
098998ac89
|
Science Station
|
2015-01-18 21:43:40 -05:00 |
|
|
Markolie
|
bd11c78235
|
Replace every instance of NanoTrasen with Nanotrasen.
|
2014-11-29 21:01:29 +01:00 |
|
|
d3athrowandZomgPonies
|
6a4866e199
|
Fix POS not opening the menu when you slap with your ID and make it not show the [user] attacked the thing with your ID as well.
|
2014-07-17 05:38:43 -04:00 |
|
|
Mark AherneandZomgPonies
|
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
|
399e4909d6
|
The death of assistants. Long live civilians!
|
2014-06-27 17:57:18 -04:00 |
|
|
ZomgPonies
|
cb9b6fca4d
|
Replacing civilian with support department. Still need to make changes on MySQL schema.
|
2014-06-26 19:42:14 -04:00 |
|
|
Necaladun
|
ce4066c936
|
Minor map tweaks and NGS-> NCS
|
2014-06-27 05:30:52 +09:30 |
|
|
ZomgPonies
|
4fc76945af
|
Compile fix
|
2014-06-23 06:31:20 -04:00 |
|
|
ZomgPonies
|
2fd3ad5802
|
NSS Cyberiad to NGS Cyberiad
|
2014-06-21 17:02:35 -04:00 |
|
|
d3athrowandZomgPonies
|
9e60c60ac7
|
Paperpocolypse changes.
|
2014-05-29 10:32:19 -04:00 |
|
|
d3athrowandZomgPonies
|
75514ac85a
|
Fix atm spamming papers
|
2014-05-29 10:30:21 -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 LibermanandZomgPonies
|
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 |
|
|
Rob NelsonandZomgPonies
|
56d8ce28c8
|
Part 1 of economy rework: Spacecash refactor - See commit for full changelog.
* Implements stacking and stack overlays
* Simplified tiers of cash (1,10,100,500,1000, may remove 500)
* Simplified API (dispense_cash, count_cash)
Conflicts:
code/modules/admin/admin_verbs.dm
code/modules/admin/verbs/debug.dm
code/modules/economy/ATM.dm
|
2014-04-19 20:47:41 -04:00 |
|
|
ZomgPonies
|
3273ab1418
|
Econ and hud fixes
|
2013-11-25 06:12:56 -05:00 |
|