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
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
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
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
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
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
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
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
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
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
fd6cc3e458
HA HA NEW GENE HANDLING
...
Also fixed block injector crash.
Conflicts:
code/game/dna.dm
code/modules/mob/living/carbon/monkey/monkey.dm
html/changelog.html
2014-01-20 01:41:03 -05:00
dc60cc1726
DNA modifiers work now.
...
Conflicts:
code/defines/obj/hydro.dm
code/game/machinery/cloning.dm
code/game/machinery/hydroponics.dm
code/modules/mob/living/carbon/zombie/zombie.dm
code/modules/mob/transform_procs.dm
2014-01-20 00:54:46 -05:00
4a8ca0a7d4
Now tested up to character join.
2014-01-20 00:44:10 -05:00
db21525feb
SAY HELO TO DNA2, N3X15'S AWFUL FUCKING RECODE OF DNA
...
Conflicts:
baystation12.dme
code/game/gamemodes/setupgame.dm
code/game/objects/items/weapons/dna_injector.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/human_defines.dm
code/modules/mob/new_player/new_player.dm
2014-01-20 00:43:19 -05:00
331cf1df95
Updated all suicide_act()s to use a new span class, 'suicide'.
...
Conflicts:
code/game/objects/items/stacks/sheets/glass.dm
code/game/objects/items/weapons/melee/energy.dm
code/game/objects/items/weapons/melee/misc.dm
code/game/objects/items/weapons/stunbaton.dm
code/game/objects/items/weapons/weaponry.dm
code/modules/hydroponics/growninedible.dm
code/modules/hydroponics/hydroitemdefines.dm
code/modules/surgery/tools.dm
code/stylesheet.dm
2014-01-19 21:25:47 -05:00
90496be20a
Standardized intent names so it's all harm. Fuck you hurt.
2014-01-19 08:30:50 -05:00
085de1b71c
Resolves #2213 Fixes the back icons for the scythe and the Roman shield.
...
Conflicts:
icons/mob/back.dmi
2014-01-19 05:32:34 -05:00
eb76256f04
Adds the captain's medal to the medal's lockbox.
...
Fixes issue 2358
Conflicts:
code/game/objects/items/weapons/storage/lockbox.dm
2014-01-16 21:55:00 -05:00
b80552169c
Stupid type
2014-01-15 13:13:13 -05:00
c1c49fe6d8
Canister, Tank & Tank Transfer Value NanoUIs.
...
* Added Canister, Tank & Tank Transfer Value NanoUIs.
Conflicts:
code/game/machinery/atmoalter/canister.dm
nano/css/shared.css
2014-01-15 01:53:51 -05:00
55e918cc6a
Wire hacking recode from /tg/.
...
Conflicts:
baystation12.dme
code/__HELPERS/mobs.dm
code/defines/obj/weapon.dm
code/game/machinery/alarm.dm
code/game/machinery/doors/airlock.dm
code/game/machinery/machinery.dm
code/game/machinery/vending.dm
code/game/objects/items/devices/paicard.dm
code/game/objects/items/weapons/explosives.dm
code/global.dm
code/modules/assembly/signaler.dm
code/modules/mob/living/silicon/mommi/life.dm
code/modules/mob/living/silicon/mommi/mommi.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/living/silicon/robot/wires.dm
2014-01-12 22:37:55 -05:00
f217cae518
NanoUI PDA optimizations no more sortAtom every tick on every PDA.
...
Should be noticably better on large population servers.
Conflicts:
code/game/objects/items/devices/PDA/PDA.dm
2014-01-11 21:50:53 -05:00
3d34a12066
Minor nuke toy edit
...
Moved the user.visible_message call out of spawn()
Removed the now obsolete sleep() call and put the delay in spawn()
2014-01-11 12:45:45 -05:00
24e29deeaf
Adds "surround" arg to playsound, which enables 3D sound
...
Defaulted to on
Also changes the toy nuke to use it
Conflicts:
code/game/sound.dm
2014-01-11 12:45:32 -05:00
7b678241e4
Adds a visible_message to the nuke toy when it is used
2014-01-11 12:40:53 -05:00
e235bc94e6
Adds new nuke toy, plays nuke sound when attack_self'd
...
Cooldown of 5 minutes
Conflicts:
code/game/machinery/computer/arcade.dm
code/game/objects/items/toys.dm
icons/obj/toy.dmi
2014-01-11 12:40:19 -05:00
RKF45