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
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
cb5367ed96
Switching cable coils to stacks
2014-01-21 21:23:26 -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
9fdde1eec7
Fix #388 : Incorrect C4 timing checks.
...
Conflicts:
code/game/objects/items/weapons/explosives.dm
2014-01-10 01:59:07 -05:00
da6b615e44
Adjacent didn't work, back to using get_dist.
2014-01-10 01:56:45 -05:00
d101e5c111
RCDs no longer create plating with air on it.
...
Fixes #3545
2014-01-09 20:26:28 -05:00
9bdae9ff75
Fix fire extinguishers bluespacing their contents afar when dumping.
...
Also use Adjacent so we can't dump through windows.
Conflicts:
code/game/objects/items/weapons/extinguisher.dm
2014-01-09 05:09:51 -05:00
68fd13b90c
Fix fire extinguisher not being fillable with the top off.
2014-01-05 22:35:30 -05:00
aa8fcc9b15
Randomized lawset system + config options
2014-01-05 17:50:13 -05:00
6827a12afe
Fire extinguishers can now spray any reagent desired.
2014-01-03 21:22:53 -05:00
8f9e08150e
mecha fixes
2014-01-02 20:51:47 +01:00
a0d866b366
Popable cans and beer cans
2013-12-31 21:44:21 -05:00
04542065e5
Tons of new Mafia-theme stuff
2013-12-29 14:30:29 -05:00
dcaeea24bf
Adding large cardboard boxes
2013-12-25 07:06:13 -05:00
9ad437b8c5
Adding checks for LAssailant everywhere whee
2013-12-23 04:57:44 -05:00
9a8d2ff8b8
Removedd console spam
2013-12-23 02:54:20 -05:00
5df339188e
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
2013-12-23 02:49:59 -05:00
4def7c9a65
Added RPD
2013-12-23 02:49:52 -05:00
6e0f7ac0be
Made explosive implants use a random phrase instead of preset one
2013-12-23 08:01:49 +01:00
5661d24dc7
Updated ashtray code!
2013-12-22 06:36:27 -05:00
5ce256b73c
Organ/Surgery Overhaul Part 1
2013-12-19 07:25:55 -05:00
62b0b49659
Brain Borer Overhaul
2013-12-19 03:32:19 -05:00
7658fe255d
Vamp update 5
2013-12-16 02:37:07 -05:00
12b8ae8d76
Magic Overhaul
2013-12-14 05:54:03 -05:00
377ed51bd6
IP changes
2013-12-06 23:06:37 -05:00
3ee10cb855
Station name fix
2013-12-05 08:10:54 +01:00
548c84d31e
Added Supermatter manual, Atmos pipe manual, EVA manual
2013-12-05 08:06:48 +01:00
51691472f8
Finalized Gamma Armory
2013-11-28 04:21:32 -05:00
ZomgPonies