ESwordTheCat
16d5d18e7c
Revert from area to text.
...
Conflicts:
code/modules/power/power.dm
2014-04-20 03:37:00 -04:00
ESwordTheCat
84c296e741
Use the experimental getArea.
...
Conflicts:
code/modules/power/power.dm
2014-04-20 03:28:46 -04:00
ESwordTheCat
51c8b9306d
Declare myArea as an area.
2014-04-20 03:27:41 -04:00
ESwordTheCat
30ad27872f
experimental getArea() proc.
2014-04-20 03:27:31 -04:00
ESwordTheCat
44ee513752
Because it use less instructions.
2014-04-20 03:27:17 -04:00
ESwordTheCat
b332bc7dec
Don't use get_area proc, introduce myArea variable.
...
Conflicts:
code/modules/power/power.dm
2014-04-20 03:26:59 -04:00
ZomgPonies
f9a773c84d
Fix smoke
2014-04-20 02:34:40 -04:00
Necaladun
961bd99d2c
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
2014-04-20 12:28:34 +09:30
Necaladun
9dff158fa2
Access changes
...
EVA access to heads. Brig/sec doors to customs.
2014-04-20 12:28:10 +09:30
Necaladun
5e812fb047
Club needs power
...
Club now needs power, APC is added
2014-04-20 12:27:53 +09:30
ZomgPonies
4b1619ddf5
Fix for binary speak?
2014-04-19 22:14:08 -04:00
Rob Nelson
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
Rob Nelson
b34d436756
Fix jukebox formatting
2014-04-19 20:37:01 -04:00
ESwordTheCat
cb2ecbaa30
Reduce use of named arguments.
2014-04-19 20:36:47 -04:00
Rob Nelson
0221e5bdff
Fix jukebox after hammering it :V
2014-04-19 20:33:35 -04:00
Rob Nelson
2389e9a778
Fix a bunch of jukebox issues, clean up UI a bit, add feedback, allow slapping it to reset if broken.
2014-04-19 20:33:22 -04:00
Duny
235d32999a
Fix borgs not choosing an appareance
...
Locks down cyborgs after they choose a module until they choose an
appareance, to prevent standard borgs with security modules and such
running around.
Conflicts:
code/modules/mob/living/silicon/robot/robot.dm
2014-04-19 20:32:58 -04:00
Duny
0acb55c296
Fixed Incendiary Mithocondria, nerfed Cryokinesis a bit
...
Incendiary Mithocondria now sets yourself on fire as intended instead of
doing nothing.
Cryokinesis now freezes you for a bit more than ten seconds and deals 20
damage instantly then around ten damage instead of the 30 seconds of
freeze and more than 40 damage over the duration it did before.
Conflicts:
code/game/dna/genes/goon_powers.dm
2014-04-19 20:29:34 -04:00
ESwordTheCat
37bcc29ca5
Opacity is more realistic than density.
2014-04-19 20:21:59 -04:00
Rob Nelson
6d7040e735
A few remaining jukebox bugs
...
Conflicts:
code/modules/media/mediamanager.dm
2014-04-19 20:21:44 -04:00
Rob Nelson
ac5fcf31a5
Autoplay after power restoration when emagged.
2014-04-19 20:03:33 -04:00
ESwordTheCat
6e7ec7ff21
Turn off debugging.
2014-04-19 20:03:15 -04:00
ESwordTheCat
65d24a2b32
Initialization fix.
2014-04-19 20:03:03 -04:00
Rob Nelson
cf4b9f5e42
Emaggable jukebox.
2014-04-19 20:02:42 -04:00
ESwordTheCat
6e0a6e4959
HONK!
2014-04-19 20:02:01 -04:00
ESwordTheCat
3b5f4b5044
Dynamic initialization.
2014-04-19 20:01:42 -04:00
ESwordTheCat
489eedf786
...it's a type too ;_;.
2014-04-19 20:01:33 -04:00
ESwordTheCat
d57ed7287c
Turn off debugging and we wait for feedback.
2014-04-19 20:01:22 -04:00
ESwordTheCat
07d50b4e8d
Why I forgot this small things.
2014-04-19 20:01:10 -04:00
ESwordTheCat
3350cd0b19
And this too.
2014-04-19 20:00:58 -04:00
ESwordTheCat
f9e2fbab40
It should be a type.
2014-04-19 20:00:45 -04:00
ESwordTheCat
28b8001188
Implement it to grille.
...
Conflicts:
code/game/objects/structures/grille.dm
2014-04-19 20:00:15 -04:00
ESwordTheCat
fdd889e9ff
Introduce resetVariables proc.
2014-04-19 19:59:13 -04:00
ESwordTheCat
fc1b9e8b56
Modify implementatio based on feedback.
2014-04-19 19:59:00 -04:00
ESwordTheCat
c43652b33a
Okay shards converted to pool usage now.
...
Conflicts:
code/game/machinery/computer/arcade.dm
code/game/machinery/doors/windowdoor.dm
code/game/machinery/telecomms/traffic_control.dm
code/game/objects/structures/displaycase.dm
code/modules/mining/mine_turfs.dm
code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
2014-04-19 19:57:53 -04:00
ESwordTheCat
2ff6d65212
Move up the directives.
2014-04-19 19:45:12 -04:00
ESwordTheCat
e6dda96934
Null the loc.
2014-04-19 19:44:54 -04:00
ESwordTheCat
28b0a428e0
Forgot this file.
2014-04-19 19:44:46 -04:00
ESwordTheCat
6d682cc340
Little improvement to debug messages.
2014-04-19 19:44:30 -04:00
ESwordTheCat
7061db9a8c
Add debug directives.
2014-04-19 19:44:19 -04:00
ESwordTheCat
296d5cd57f
Early load the pool.
2014-04-19 19:44:03 -04:00
ESwordTheCat
be65bf7195
Add reminder.
2014-04-19 19:43:53 -04:00
ESwordTheCat
eee597ee4c
Forgot these variables to reset.
2014-04-19 19:43:04 -04:00
ESwordTheCat
907971e8ab
Grille complete pooling.
2014-04-19 19:42:55 -04:00
ESwordTheCat
424df5eaf7
We object pool grille now.
2014-04-19 19:42:42 -04:00
ESwordTheCat
75b6f2a2dd
return pool for plasma shards.
2014-04-19 19:42:29 -04:00
ESwordTheCat
1cb513e29b
Fix runtime error.
2014-04-19 19:42:17 -04:00
ESwordTheCat
dde219a581
Object pooling immature implementation.
...
Conflicts:
code/__HELPERS/experimental.dm
2014-04-19 19:42:04 -04:00
Rob Nelson
9227481a8a
Standardize windows.
...
Conflicts:
code/WorkInProgress/buildmode.dm
code/game/machinery/doors/airlock.dm
code/game/objects/items/stacks/sheets/glass.dm
code/game/objects/items/weapons/twohanded.dm
code/game/objects/structures/window.dm
code/modules/mining/mine_items.dm
code/modules/mob/living/carbon/metroid/metroid.dm
code/modules/mob/living/simple_animal/constructs.dm
code/modules/mob/living/simple_animal/friendly/corgi.dm
2014-04-19 19:36:33 -04:00
VelardAmakar
dc6f794368
Adds the ability to construct, destroy, and take apart bookcases.
...
Bookcases can be built using 5 wood planks.
Bookcases can be destroyed using weapons(50HP).
Bookcases can be taken apart using a wrench.
2014-04-19 19:13:33 -04:00
