c69ddf76ec
Reintroducing the dough-based cooking system.
...
Conflicts:
code/modules/food/recipes_microwave.dm
code/modules/reagents/reagent_containers/food/snacks.dm
icons/obj/food.dmi
2014-02-01 19:22:22 -05:00
05149946d6
Remove borken RPD
2014-02-01 04:30:17 -05:00
7a99402138
Compile fix
2014-01-31 03:19:42 -05:00
c72e625e53
Returned to the forces of light thanks to gia
...
No more text paths, only normal paths
2014-01-31 02:56:40 -05:00
5c8d9ede3b
Added chem handling and IED recipe
...
Uh oh
Conflicts:
code/game/atoms.dm
code/game/objects/items/weapons/stunbaton.dm
code/game/objects/structures/tables_racks.dm
2014-01-31 02:56:27 -05:00
17151cd7b2
Some recipes and addable parts
...
Indeed
2014-01-31 02:51:57 -05:00
58cb6a147a
Return to the text paths
...
Yes byond doesnt let me use normal paths as association for numbers
2014-01-31 02:51:36 -05:00
88ee7313b5
Merge pull request #139 from SamCroswell/master
...
Additional Select Equiptment Option, More Areas
2014-01-30 23:46:47 -08:00
c3b021e246
Added a garbage collector implementation based on rumors from Goon and proc references in released gooncode.
...
And holy shit it's fast
Conflicts:
baystation12.dme
code/ATMOSPHERICS/pipes.dm
code/game/machinery/Sleeper.dm
code/game/machinery/rechargestation.dm
code/game/objects/structures/crates_lockers/crates.dm
code/game/objects/structures/tables_racks.dm
code/modules/mining/mine_turfs.dm
code/modules/paperwork/photocopier.dm
code/modules/power/cable.dm
html/changelog.html
2014-01-29 23:45:21 -05:00
12ffdb84bd
PDA icon fixes, various fixes to select equipt
2014-01-29 17:24:51 -05:00
6dfa08040c
Merge pull request #131 from SamCroswell/master
...
More C4 suicide phrases. For no Raisin.
2014-01-28 20:15:26 -08:00
8c5ad54e0f
Recommitting a ton of files as one commit due to needing to reset this repo to an earlier point in the log. Full changes in PR.
...
Conflicts:
code/game/objects/items/weapons/implants/implant.dm
code/modules/admin/verbs/vox_raiders.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/monkey/diona.dm
code/modules/mob/living/carbon/species.dm
2014-01-28 15:30:20 -05:00
559700a58b
Added a bunch of new goon powers.
...
Conflicts:
code/modules/mob/living/carbon/human/emote.dm
2014-01-26 14:48:33 -05:00
beea722e60
More C4 suicide phrases. For no Raisin.
2014-01-26 14:45:16 -05:00
f084d49d24
Compile fixes
2014-01-25 12:40:47 -05:00
2e5fc8a4fc
Revert "Display cases now constructable."
...
This reverts commit 3e210aa75c
2014-01-25 12:29:29 -05:00
22f6bb90be
Add additional extinguisher logging, transfer logging framework.
...
Conflicts:
code/game/objects/items/weapons/extinguisher.dm
2014-01-25 12:29:21 -05:00
58275e6ddc
Fuck you emisune
2014-01-25 12:27:07 -05:00
253035f935
Fixes #452 , people who are silenced for whatever reason or miming can't use the megaphone
2014-01-25 12:26:54 -05:00
3e210aa75c
Display cases now constructable.
...
* Make machine frame
* Add glass (do not wire)
* Add airlock controller board (set perms first)
* Screwdriver
Disassemble by crowbarring when unlocked or broken.
Conflicts:
get_dmi_header.bat
html/changelog.html
icons/obj/stock_parts.dmi
2014-01-24 21:42:33 -05:00
dd7f48c470
More typo.
2014-01-24 12:24:35 -05:00
e3a2a9238d
Fix typo before someone notices.
2014-01-24 12:24:14 -05:00
47e8c640a2
New display case code
2014-01-24 12:23:26 -05:00
341d210c99
Fix some issues with the radio, like talking on common when calling for command.
2014-01-24 12:04:52 -05:00
d01ef41eac
Radio code in say.dm cleaned up, will use all possible radios when sending a message.
...
Conflicts:
code/modules/mob/living/say.dm
2014-01-23 23:48:46 -05:00
f1c80be06f
Merge pull request #127 from SamCroswell/master
...
Tweaks 'n shit
2014-01-23 20:34:50 -08:00
7ad68dd693
Replaced wall_smash in simple_animal with environment_smash, because before, you either tables AND walls, or nothing. If set to 1, smash crate/locker/rack/table, 2 for wallsmash, 3 for rwall smash
...
Hostile mobs with environment smash will also unbuckle themselves by destroying whatever they're buckled to when angered.
Conflicts:
code/game/objects/structures/stool_bed_chair_nest/bed.dm
code/game/objects/structures/tables_racks.dm
code/game/turfs/simulated/walls.dm
code/modules/mob/living/simple_animal/hostile/hostile.dm
2014-01-23 23:31:36 -05:00
d4890fb2f5
Additional Drug Names
2014-01-23 19:26:32 -05:00
f59fa5474e
Contraband Crate Changes, Minor Drug Tweaks
...
More little tweaks to the random drugs, added actual contraband to the
contraband crate. Maybe people will have a reason to buy it now, eh?
2014-01-23 18:01:41 -05:00
6478e2e1d7
silent is broken as fuck
...
Removes the message that checks if a mob is silent; silent is just plain broken.
2014-01-23 10:34:41 -05:00
f54a35db72
Prevents mimes from using the megaphone.
...
if(user.silent) didn't work. This is the next best thing.
2014-01-23 10:34:03 -05:00
a3a883444c
Last minute tweaks
2014-01-22 23:12:50 -05:00
fc4877b301
Added a few more drug names
2014-01-22 22:55:19 -05:00
86ad8a5a17
Drugs/Minor CentComm Updates
2014-01-22 22:26:01 -05:00
7a10f3c626
Black Baseball Caps [FIXED]
...
Conflicts:
code/game/objects/structures/crates_lockers/closets/job_closets.dm
icons/mob/head.dmi
icons/obj/clothing/hats.dmi
2014-01-22 11:07:39 -05:00
95f7280781
Generic attack sounds for all melee weapons
...
Overrides the generic sounds with more suitable ones where needed.
Weapons that do no damage don't have sound effects.
Conflicts:
code/game/gamemodes/wizard/artefact.dm
code/game/objects/items/stacks/sheets/glass.dm
code/game/objects/items/weapons/melee/misc.dm
code/game/objects/items/weapons/storage/toolbox.dm
code/game/objects/items/weapons/stunbaton.dm
code/game/objects/items/weapons/weaponry.dm
code/game/objects/weapons.dm
code/modules/hydroponics/hydroitemdefines.dm
code/modules/surgery/tools.dm
2014-01-22 10:15:43 -05:00
7892eeb7cc
Standardize LASER, NOCLONE, and HUSK
...
Conflicts:
code/game/gamemodes/changeling/changeling_powers.dm
code/modules/mob/living/carbon/human/death.dm
maps/RandomZLevels/wildwest.dm
2014-01-21 22:59:53 -05:00
f44ff1d7aa
Standardize FAT
...
Conflicts:
code/modules/client/preferences.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/living/simple_animal/constructs.dm
code/modules/mob/mob.dm
code/modules/mob/mob_grab.dm
2014-01-21 22:57:10 -05:00
d49e6d3bf4
Standardize CLUMSY
...
Conflicts:
code/game/jobs/job/civilian.dm
code/game/objects/items/weapons/defib.dm
code/game/objects/items/weapons/stunbaton.dm
code/modules/mob/living/silicon/robot/component.dm
code/modules/reagents/reagent_containers/syringes.dm
2014-01-21 22:49:22 -05:00
22a2df1115
Standardize HULK.
...
Conflicts:
code/game/mecha/mecha.dm
code/game/objects/items/weapons/swords_axes_etc.dm
2014-01-21 22:45:40 -05:00
dd8c8c12ab
Standardize XRAY.
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
maps/RandomZLevels/wildwest.dm
2014-01-21 22:37:37 -05:00
cb5367ed96
Switching cable coils to stacks
2014-01-21 21:23:26 -05:00
8f71ea55e3
Added tools and time handling
...
Well yeah
2014-01-21 21:05:50 -05:00
56e56b31a6
Implemented crude crafting
...
Debug messages are still inside, pushing only cozx pete asked me to
Conflicts:
code/_globalvars/lists/objects.dm
code/game/objects/structures/tables_racks.dm
2014-01-21 21:05:42 -05:00
57dc0ddd50
Implement toxic farts.
...
Conflicts:
code/game/objects/effects/effect_system.dm
code/modules/mob/living/carbon/human/human_defines.dm
2014-01-21 14:35:15 -05:00
bb853093c1
Intercom runtime fix
2014-01-20 04:05:29 -05:00
a04324baef
Fix more by-ref issues in DNA
...
Conflicts:
code/game/machinery/hydroponics.dm
2014-01-20 01:54:33 -05:00
c349f761d9
Fixes for DNA2, again,
2014-01-20 01:50:56 -05:00
20bc568131
Fix DNA injectors breaking shit.
...
Conflicts:
code/game/dna/dna2_helpers.dm
2014-01-20 01:49:49 -05:00
6fe47cfc51
Standardize buffers on all DNA machines in an attempt to fix DNA modifiers. WILL BREAK SHIT
...
Conflicts:
code/game/machinery/computer/cloning.dm
code/game/objects/items/weapons/dna_injector.dm
2014-01-20 01:48:57 -05:00
RKF45