b332bc7dec
Don't use get_area proc, introduce myArea variable.
...
Conflicts:
code/modules/power/power.dm
2014-04-20 03:26:59 -04:00
f9a773c84d
Fix smoke
2014-04-20 02:34:40 -04:00
4b1619ddf5
Fix for binary speak?
2014-04-19 22:14:08 -04:00
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
b34d436756
Fix jukebox formatting
2014-04-19 20:37:01 -04:00
cb2ecbaa30
Reduce use of named arguments.
2014-04-19 20:36:47 -04:00
0221e5bdff
Fix jukebox after hammering it :V
2014-04-19 20:33:35 -04:00
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
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
6d7040e735
A few remaining jukebox bugs
...
Conflicts:
code/modules/media/mediamanager.dm
2014-04-19 20:21:44 -04:00
ac5fcf31a5
Autoplay after power restoration when emagged.
2014-04-19 20:03:33 -04:00
cf4b9f5e42
Emaggable jukebox.
2014-04-19 20:02:42 -04:00
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
75b6f2a2dd
return pool for plasma shards.
2014-04-19 19:42:29 -04:00
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
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
a947775f2e
Add missing lens.
...
Conflicts:
code/modules/mob/mob.dm
2014-04-19 19:13:05 -04:00
dd1613f6c4
you can set the volume of the jukebox now, preferences tab -> set volume
...
Conflicts:
code/modules/media/mediamanager.dm
2014-04-19 18:58:56 -04:00
0dcee05ab2
Watertank nozzles no longer delete
...
Conflicts:
code/game/objects/items/weapons/tanks/watertank.dm
code/modules/mob/mob_helpers.dm
2014-04-19 18:17:49 -04:00
c948e01b85
Customizable clown mask with 2 new options
...
Conflicts:
code/modules/clothing/masks/gasmask.dm
config/admins.txt
icons/mob/mask.dmi
icons/obj/clothing/masks.dmi
2014-04-19 18:13:27 -04:00
e224a636b9
Some fixes saycode cleanups
...
Moved the verb check from hear to the speaker
Spellcheck on hulk so Dragor doesn't beat me up.
2014-04-19 17:06:23 -04:00
b28df8857d
Saycode rewrite: Add support for speech_problem_flag
...
Ready for Dev
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2014-04-19 17:06:05 -04:00
9965c5ff8d
Removal of last debug message and making players be able to use languages over general comms
...
;:k = skrell speak over general comms for example.
2014-04-19 17:04:47 -04:00
66f3d8ab75
Say code rewrite, Silicon jerks now using new saycode.
...
Tracking added for AI's and Observers
Instead of calling GetVoice() over and over for everyone that can hear you we're checking a variable that is updated with Life()
removed a bunch of my debug verbs.
Conflicts:
code/game/machinery/telecomms/broadcaster.dm
code/modules/mob/dead/observer/observer.dm
code/modules/mob/living/carbon/human/human_defines.dm
code/modules/mob/living/silicon/say.dm
2014-04-19 17:04:29 -04:00
9dab2ad8a1
Saycode rewrite initial commit.
...
Create structure for modular saycode
Regular chat:
specific_paths/say() -> living/say() -> specific_paths/hear_say()
Radio chat:
specific_paths/say() -> Telecoms shit -> specific_paths/hear_radio()
Humans done.
Todo: AI, Robot, simple_animal, and ghosts.
Conflicts:
code/game/machinery/telecomms/broadcaster.dm
code/game/machinery/telecomms/telecomunications.dm
code/modules/mob/living/carbon/human/human_defines.dm
code/modules/mob/living/carbon/human/say.dm
code/modules/mob/living/say.dm
2014-04-19 16:54:16 -04:00
184162e8db
disregard failure. I made a silly.
2014-04-19 16:44:45 -04:00
9ddc4aae92
initial CC paper commit. Will continue work on this.
...
Conflicts:
code/modules/paperwork/photocopier.dm
icons/obj/bureaucracy.dmi
2014-04-19 16:44:20 -04:00
f98a2af41f
Fueltanks leak fuel when wrenched open
...
Fueltanks now actually leak fuel when wrenched open. The leaking only occurs at the initial wrenching and when tank is moved.
Conflicts:
code/modules/reagents/reagent_dispenser.dm
2014-04-19 16:41:17 -04:00
14744895c5
Juggernauts will no longer be weakened and unable to click stuff if zas knocks them over.
2014-04-19 16:35:21 -04:00
e1af1f4713
replaced electrodes with insta hit taser beams.
...
Conflicts:
code/modules/projectiles/guns/energy/stun.dm
code/modules/projectiles/projectile/beams.dm
icons/obj/projectiles.dmi
2014-04-19 16:28:23 -04:00
843ac65077
Undershirts and rolling down jumpsuits!
...
Conflicts:
code/modules/client/preferences.dm
code/modules/client/preferences_savefile.dm
icons/mob/human.dmi
icons/mob/uniform.dmi
2014-04-19 16:17:14 -04:00
60ede94929
Also fixes paperbin without hands
...
Whee.
2014-04-19 15:53:44 -04:00
90ff395199
Lagsie no more, NarSie HUNGERS
...
removed del() calls for objects, now it sets loc to null and removes it from master_controller processing
Much quicker :)
Conflicts:
code/modules/power/singularity/singularity.dm
2014-04-19 15:48:48 -04:00
f43ef06431
Virology - NanoUI, gameplay tweaks, bugfixes
...
Conflicts:
.gitignore
code/game/machinery/kitchen/smartfridge.dm
code/game/machinery/machinery.dm
code/modules/food/recipes_microwave.dm
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/virus2/isolator.dm
nano/js/nano_base_helpers.js
2014-04-19 15:42:49 -04:00
0288be9081
Jukebox
...
Adding missing , because i need more coffee
2014-04-16 18:27:44 +09:30
fdabde9f84
Jukebox additions
...
Removed empty jazz playlist, added papers please and aussie music
2014-04-16 17:26:52 +09:30
d3757b9413
Hyperzine bottle
...
A pre-spawned bottle of hyperzine
2014-04-16 09:49:20 +09:30
f7246e3a40
Swap NT Rep and Customs Officer costs
...
30 for NT Rep, 15 for Customs Officer to represent their importance.
2014-04-15 00:37:27 +09:30
3e3fc0f314
Wisewill Sprites
...
Added wisewills sprites - bane stuff, sec rig fixes
2014-04-15 00:29:51 +09:30
dc417a522d
Stun Revolver Upgrade
...
Stun Revolver update - makes it do slightly less pain, but a little bit
of stun and weaken to give it some actual purpose
2014-04-15 00:28:38 +09:30
369c894173
Fixed crash when hacking vending machines on clown planet
2014-04-09 01:33:43 +02:00
cfbfa0e993
Smoke rework caused endless loops, reverted.
2014-04-08 01:47:56 +02:00
521ad31671
Revert the new lighting system.
2014-04-07 23:51:35 +02:00
fe0411ac1b
Merge branch 'genetics_instability' into ServerCode
2014-04-05 17:41:37 +02:00
9bea0a097a
trans_to_ingest now used for consumption of food, drink and pills instead of trans_to. This adds a ten second delay between ingestion and addition of the reagents to the body.
...
Conflicts:
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/reagent_containers/food/cans.dm
code/modules/reagents/reagent_containers/food/condiment.dm
2014-04-05 17:39:14 +02:00
c74ff2d653
Fixes biogenerator typo, improper beaker splashing, and allows glass beakers to refill botany trays
...
Conflicts:
code/modules/reagents/reagent_containers/glass.dm
2014-04-03 21:42:33 +02:00
ed69c23e07
Bugfix for new APC code, gridchecks won't just turn off equipment.
...
Was a problem with me switching the order of the checks.
Conflicts:
code/modules/power/apc.dm
2014-04-03 21:37:43 +02:00
e915af4fe5
Runtime fix
...
- Fixed a runtime caused by effects bumping disposal chutes.
Conflicts:
code/modules/recycling/sortingmachinery.dm
2014-04-03 18:21:46 +02:00
99751c0416
Reagent reaction_mob/turf tweaks
...
- Adds an if() check to reaction_mob for catching a very rare runtime related to mobs inhaling smoke reagents from just deleted smoke.
- Carbons reaction_turf proc now modifies a single dirt overlay layer, instead of just adding more decal objects to the turf.
- Added some checks to the radium and uranium reaction_turf proc so it doesn't stack multiple greenglow decals.
- Performed colon removal surgery on thermites reaction_turf proc, also tweaked it's overlay operation to correctly overlay a chemical puddle effect, instead of a melted wall effect.
- Removed space_cleaners overlays.Cut() code, since it was removing decals from turfs.
Conflicts:
code/modules/reagents/Chemistry-Reagents.dm
2014-04-03 18:21:45 +02:00
0fba806c7b
Chemsmoke rewrite
...
- Complete rewrite of the chemsmoke spawning code (everything that happens after the reaction to create the smoke).
- Moved it into it's own file since it's a little longer than the old one code-wise.
- Tweaked the smoke sprites; gave chemsmoke directions for more randomization, and tweaked the timing of their animations so they are smooth now.
Most of the code is documented, so you should be able to follow what's going on just reading through it. In short though:
- Chemsmoke now affects a circular area with a variable range depending on the total amount of chemsmoke created (no more 1-of-each-ingredient smoke grenades - sorry).
- The carried reagent volume in the cloud balances itself according to how big the affected area is (larger area, less carried reagent per turf).
- The carried reagent has more volume the closer you are to the centre of the cloud.
- The visual smoke effect scales with how big the affected area is.
Conflicts:
code/game/objects/effects/effect_system.dm
icons/effects/96x96.dmi
2014-04-03 18:21:26 +02:00
ESwordTheCat