Hubblenaut
32b463237f
Final adjustments to icons, adds delay to pinning
2015-05-12 17:21:37 +02:00
Hubblenaut
1b3ddb8633
Merge remote-tracking branch 'upstream/dev' into dev
...
Conflicts:
code/game/objects/structures/stool_bed_chair_nest/bed.dm
code/modules/mob/mob_grab.dm
2015-05-12 14:39:21 +02:00
PsiOmega
b52cf35680
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/projectiles/projectile.dm
2015-05-12 13:40:47 +02:00
ccomp5950
569e785014
Holodeck items no longer spam admin attack logs.
...
/obj/items now has no_attack_log variable if set to 1, it won't log.
All holodeck items and lasertag weapons have no_attack_log set.
<3 Mangled
2015-05-11 22:11:46 -04:00
Hubblenaut
fb8812d1b7
Adds knifing, pressing eyes, jointlocking, headbutting, pushing, dancing and forcing onto the floor
...
fixup
2015-05-10 17:54:34 +02:00
PsiOmega
151c5204ee
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/modules/projectiles/gun.dm
html/changelogs/RavingManiac-master.yml
2015-05-05 08:11:28 +02:00
RavingManiac
6123c8421e
Intent menu appears on zoom
2015-05-04 16:58:24 +10:00
PsiOmega
1ae0ad6d92
Updates the atom_pool, now datum_pool, to handle any datum object.
...
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
PsiOmega
a6a428af6a
Mecha + misc. Destroy() because I had already begun.
2015-04-17 09:55:59 +02:00
PsiOmega
d381eb6083
Drops the machinery part of the singularity.
2015-04-16 12:51:02 +02:00
PsiOmega
1511e2b3f4
Ports /vg/'s Nas-Sie remake.
...
Second phase:
New Nar-Sie itself.
Two endgame phase - Nar-Sie and Supermatter Cascade.
Culty mobs.
2015-04-12 16:19:16 +02:00
PsiOmega
990530d118
Ports /vg/'s spell system for the sake of cult porting.
...
Does offer a much more pleasant basis to work with in the future, if someone wishes to add more spell-like abilities.
2015-04-09 20:08:06 +02:00
Chinsky
4a897e47b9
Merge pull request #8641 from PsiOmegaDelta/CultVisualNetwork
...
Cult Visual network
2015-04-06 20:19:49 +03:00
Mustafa Kalash
6e710ad426
Fixes switch operators.
2015-04-03 22:10:23 -04:00
Mustafa Kalash
3c767c50fa
Refactors
2015-04-03 21:33:33 -04:00
Mustafa Kalash
94a56e3c2b
Adds a toggle for allowing a target to use a radio (handheld or headset.)
2015-04-03 17:42:16 -04:00
PsiOmega
cf45daa66c
Cuts out for now unnecessary parts, to allow merge of functional code.
2015-04-01 12:51:02 +02:00
PsiOmega
56a8195d1c
Merge remote-tracking branch 'upstream/dev' into CultVisualNetwork
...
Conflicts:
code/setup.dm
2015-04-01 12:47:31 +02:00
mwerezak
398459c2e7
Merge remote-tracking branch 'upstream/dev' into inventoryfix
...
Conflicts:
code/modules/organs/organ_external.dm
2015-03-31 02:13:22 -04:00
mwerezak
9b2f5cea33
Merge remote-tracking branch 'upstream/dev' into inventoryfix
...
Conflicts:
code/game/gamemodes/revolution/rp-revolution.dm
code/game/machinery/kitchen/juicer.dm
code/game/objects/items/stacks/stack.dm
code/game/objects/items/weapons/cigs_lighters.dm
code/game/objects/structures/stool_bed_chair_nest/stools.dm
code/modules/destilery/main.dm
code/modules/hydroponics/biogenerator.dm
code/modules/mob/living/carbon/human/inventory.dm
code/modules/mob/living/carbon/monkey/inventory.dm
code/modules/projectiles/guns/launcher/pneumatic.dm
2015-03-31 01:37:55 -04:00
=
601e6fb7ef
Merged with dev.
2015-03-31 11:17:13 +10:30
PsiOmega
a9034bca66
Merge remote-tracking branch 'upstream/dev' into CultVisualNetwork
...
Conflicts:
code/modules/mob/living/simple_animal/shade.dm
code/setup.dm
2015-03-30 22:55:24 +02:00
mwerezak
1b4e13aabc
Removes unnecessary and cruft procs from mob/inventory.dm
2015-03-30 05:28:09 -04:00
PsiOmega
464d702d4b
Mob refactoring.
...
Updates Bump() code.
Intents now use constants.
Simple animals can now use languages without overriding say().
There is now a difference between being able to smash normal and reinforced walls.
Reworks simple_animal/attackby so that constructs don't need to override it simply to add damage resistance.
2015-03-29 10:44:31 +02:00
PsiOmega
827351dda5
Merge remote-tracking branch 'upstream/dev' into Mask2
2015-03-27 14:16:55 +01:00
PsiOmega
1131c76d45
Cult visual network.
...
Implementation of a cult visual network, similar to the original camera network.
Includes the "eye" itself and the initial construction of a mob that can control one.
2015-03-27 14:16:48 +01:00
Zuhayr
aa6439096c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs
2015-03-26 23:25:26 +10:30
Zuhayr
ba648e3e8d
Updated ismonkey(), refactored kitchen spike, refactored plastic flaps.
2015-03-26 12:45:12 +10:30
Zuhayr
9c92d3851a
Got various kinds of limb loss plus dislocation working.
2015-03-25 23:11:00 +10:30
Zuhayr
d26800d29c
Preliminary work on converting all monkeys to a human subspecies.
2015-03-25 02:15:45 +10:30
Zuhayr
b9072baa97
Merge with dev.
2015-03-24 14:41:07 +10:30
Neerti
dc4d149832
Ports /tg/'s borg hotkeys. They work similarly to the AI's hotkeys.
2015-03-13 21:41:23 -04:00
Zuhayr
e0f23aead5
Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP.
2015-03-11 21:17:51 +10:30
PsiOmega
99406e3077
NanoUI AI door interface.
...
Related:
Cleans up airlock Topic()
Power and electricity is now also handled by process instead of sleeps().
Wires, remote door controls, etc. now use airlock procs instead of manhandling variables directly.
2015-03-03 13:23:18 +01:00
PsiOmega
683ef229c1
NanoUI interfaces.
...
Turret Controls.
Omni-filters/mixers now disable the On/Off button during configuration.
2015-02-28 13:21:08 +01:00
mwerezak
47cbfdd59e
Keeps zone selection and gun mode toggle HUD elements visible when scoped
2015-02-21 16:01:47 -05:00
Zuhayr
4631e53718
Merge pull request #8140 from comma/undies
...
Underwear closet, crossdressing
2015-02-17 03:03:45 +10:30
Chinsky
3f8462a399
Adds a wardrobe structure to pick your underwear.
...
Adds ability to wear female underwear as male and vice versa.
Changes 'underwear'/'undershirt' vars to hold iconstate instead of esoteric dances with array indexes.
2015-02-16 11:17:22 +03:00
mwerezak
5740f52964
Merge branch 'guns' into gun-rewrite
...
Conflicts:
code/modules/clothing/suits/armor.dm
code/modules/clothing/under/ties.dm
code/modules/projectiles/gun.dm
code/modules/projectiles/guns/energy/laser.dm
code/modules/projectiles/guns/energy/nuclear.dm
code/modules/projectiles/guns/energy/pulse.dm
code/modules/projectiles/guns/energy/special.dm
code/modules/projectiles/guns/projectile.dm
code/modules/projectiles/guns/projectile/automatic.dm
code/modules/projectiles/guns/projectile/launcher.dm
code/modules/projectiles/guns/projectile/shotgun.dm
2015-02-11 18:08:43 -05:00
mwerezak
611a42bb33
Gun cleanup and rewrite
...
Rewrites gun.dm. Reorganizes the firing procedure into logical procs and cleans up some unnecessary variables or demotes them to the subtypes that actually care. Energy weapons that create their own projectiles no longer care about in_chamber. Launcher support is much more natural now.
Cleans up duplicated cyborg energy weapon power supply code. Adds support for energy weapons to recharge from external power sources, unifying cyborg and hardsuit mounted weapons. Incorporates the cyborg taser recharging mechanism. Cleans up laser tag gun duplication
Changes path strings to actual paths. Changes relative paths to absolute paths.
Renamed several targeting vars to make their purposes more clear.
Fixed targeting not handling firing correctly for certain subtypes.
2015-02-11 15:46:09 -05:00
Kelenius
669f226fb2
Changes slime stun probabilities
...
I swear I did this already
2015-02-04 02:07:14 +03:00
Kelenius
cb25b524ab
Gives slimes a HUD and an ability to choose face
2015-02-04 01:39:30 +03:00
Kelenius
c9824f62df
Conflict fix
2015-02-03 23:29:08 +03:00
Ravensdale
1bd1687c81
Fixes runtime error: pick() from empty list
2015-01-13 13:37:07 -08:00
Kelenius
966ba79a28
Update for the slimes
...
Water damage relative to water amount
Better interface for player-controlled slimes
Feed on simple_animals
Heavy refactoring
Friendly glomps at the slimes of the same color, non-friendly at the
slimes of different color
Fixes #7647
Fixes #7107
Fixes #6812 for the slimes only
2015-01-09 02:44:02 +03:00
Zuhayr
15801e9f50
Fixes #7596
2015-01-02 19:55:50 +10:30
Zuhayr
505d84049c
Properly implements the species insulated var (renames it to siemens_coefficient), includes it in electrocution, rebalances species values accordingly.
2014-12-28 19:16:07 +10:30
Zuhayr
5d6e805206
Why in the dicks is slime code so HORRIBLE. Removes a very redundant piece of code in obj/item/attack() dealing with slimes.
2014-12-24 04:19:56 +10:30
Zuhayr
0c9d9999b3
Removed now-redundant buckle check.
2014-12-13 23:11:59 +10:30
Zuhayr
e3b5c35822
Fixes simple_animal nuzzling.
2014-12-13 22:46:33 +10:30
