mwerezak
e549a22bba
Removes world print, re-adds react() call
...
Also removes checks for if(W.reagent) in extinguisher code, as that is
being handled separately.
2014-10-28 22:13:42 -04:00
mwerezak
a0b47ce4de
Water cools hot turfs even if they do not have a hotspot.
...
Also adjusts fire extinguisher volumes to correspond to the new beaker
volumes, and scales things accordingly.
2014-10-24 21:45:02 -04:00
Chinsky
3796c034f3
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into master-dev
...
Conflicts:
icons/mob/head.dmi
icons/obj/clothing/hats.dmi
maps/tgstation2.dmm
2014-10-20 04:52:45 +04:00
Chinsky
61e50ab72a
Merge pull request #6790 from mwerezak/robot-radio
...
Fixes robot radio component not using power
2014-10-20 03:53:10 +04:00
Chinsky
f1f730894c
Merge pull request #6789 from mwerezak/binary-talk
...
Allows properly keyed radios to broadcast in robot talk and/or hivemind + some cleanup
2014-10-20 03:50:12 +04:00
mwerezak
9424d892ba
Fixes robot radio component not using power
...
Also shifts power usage so binary talk uses less power while radio uses
more.
2014-10-19 00:50:13 -04:00
Zuhayr
abc00094ca
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-10-17 06:18:49 +10:30
Zuhayr
b09591618d
Merge pull request #6738 from PsiOmegaDelta/Messaging
...
Less PDA confusion.
2014-10-17 06:16:30 +10:30
PsiOmega
4507be1430
Fixes #6735
...
Moves the open/closing sounds up the class hierarchy, from the statis bag to the body bag.
2014-10-16 10:03:48 +02:00
PsiOmega
cd940cbf4b
Less PDA confusion.
...
When writing PDA messages the input window title is now that of the receiver's PDA name instead of the sender's.
2014-10-16 09:58:59 +02:00
Mloc-Argent
4871a3a850
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/ATMOSPHERICS/pipes.dm
icons/atmos/pipes.dmi
2014-10-15 22:13:44 +01:00
PsiOmega
68f4f1809e
AI PDA tapping fix
...
An AI should no longer tap on a non-existing screen with its non-existing fingers while writing PDA messages.
2014-10-15 17:38:54 +02:00
Menshin
70b2c9a1fa
Who thought it was a good idea to omit multiplier for 1x ?!?
2014-10-14 22:48:48 +02:00
Menshin
6387c96bb5
Ambiguous expression readded.
2014-10-14 22:31:19 +02:00
Menshin
eb707ea9b6
Prevent stacks multiplier href exploit
2014-10-14 18:34:53 +02:00
Zuhayr
4c070bad02
Bunch of xeno fixes, details in PR.
2014-10-13 17:32:13 +10:30
Zuhayr
cd2b5e761d
Fixes being unable to knock on windows.
2014-10-13 11:21:37 +10:30
Zuhayr
9b23315359
Fixes #6644
2014-10-11 07:44:48 +10:30
Zuhayr
37cb78eefa
Fixes #6613 and #6492
2014-10-08 23:10:12 +10:30
Zuhayr
df038c9fe8
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-10-06 20:15:59 +10:30
Zuhayr
d0b3a3a39b
Merge pull request #6601 from Mloc/bs12-calert
...
donut boxes now update their icon to properly reflect their contents
2014-10-06 19:37:24 +10:30
Mloc
9faec14707
donut boxes now update their icon to properly reflect their contents
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-10-05 19:24:30 +01:00
Chinsky
41ce4fc57d
Merge pull request #6588 from RavingManiac/dev
...
Sniper scope improvements, binoculars
2014-10-05 03:37:33 +04:00
RavingManiac
756e9ae030
Zooming with an item is now done with a general proc zoom(). This applies to binoculars and sniper rifle.
2014-10-04 17:38:38 +08:00
RavingManiac
2aab019cba
Binoculars zoom no longer a right-click menu option. Already supplanted by attack_self().
2014-10-04 04:05:26 +08:00
Gamerofthegame
a47ec82103
Merge repair
2014-10-03 16:04:31 -04:00
RavingManiac
f0da0380a5
Sniper rifle zoom now adds a client.pixel_x/y offset in addition to zoom. Currently 11 tiles in the direction the user is facing. Zooming can now be done through the right-click menu.
...
Binoculars added. Functionally similar to sniper scope. Adminspawn-only as of this commit.
2014-10-04 04:01:56 +08:00
Zuhayr
e283fa850f
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-10-03 06:58:53 +09:30
PsiOmega
fd060cc5fe
Fixes #6546
...
Replaces iffy cartridge type checks with access checks.
2014-10-02 09:29:04 +02:00
mwerezak
3209f19304
Removes unused radio code, world print in forcesay
2014-10-01 21:49:24 -04:00
mwerezak
b88666895b
Allows properly keyed headsets to broadcast in robot talk and/or hivemind
...
Adds :0 speech code which activates radio-defined behaviour.
2014-10-01 21:39:02 -04:00
Zuhayr
6c96f3d66b
Merge branch 'xenorewrite' of https://github.com/Zuhayr/Baystation12 into dev
2014-10-02 02:39:37 +09:30
Zuhayr
305416d5c5
Merg resolution.
2014-10-02 02:33:06 +09:30
Mloc
dbff924849
fixes #6562
...
fixes #6571
Signed-off-by: Mloc <colmohici@gmail.com >
2014-10-01 17:48:17 +01:00
Zuhayr
3f05362577
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenorewrite
2014-10-01 18:16:04 +09:30
Chinsky
165bbadc10
Merge pull request #6551 from RavingManiac/dev
...
Space floating effect
2014-10-01 10:01:25 +04:00
Mloc-Argent
6fb1667b44
fixes #4742
...
not a full fix, there's too many small cases where OPENCONTAINER
isn't checked, but this is everything in the report
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-09-30 20:52:00 +01:00
Mloc
7a0b0c4369
fixes #6115
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-09-30 20:39:11 +01:00
Mloc
6a91020529
fixes #6540
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-09-30 20:13:03 +01:00
RavingManiac
c4875e7d36
Floating effect now uses animate() instead of pixel_y while loop thingy.
...
Distinct actions that indefinitely change a mob's pixel_y or pixel_x, like strapping someone to a roller bed, should also alter new variables old_y or old_x accordingly. This means that floating and jittering animations no longer interfere, as the animations use old_x/old_y as the "base" position.
Entering areas with gravity from areas without grabity now removes floating effect.
2014-09-30 22:37:48 +08:00
Zuhayr
e2ce1fa2df
Collapsed Bump() down to carbon from alien and monkey. Stripped out extraneous stuff from carbon/alien HUD. Implemented some life stuff for aliens.
2014-09-30 15:28:30 +09:30
Zuhayr
b4646b65e8
Fixed up organ transplant rejection, added cortical stacks, changed vox over to use organ stacks.
2014-09-30 14:09:41 +09:30
Zuhayr
70eedc3486
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenorewrite
2014-09-30 12:18:16 +09:30
Gamerofthegame
33b9d19df1
Commit repair
2014-09-28 17:13:42 -04:00
Zuhayr
803c5c557e
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenorewrite
2014-09-29 06:21:49 +09:30
Zuhayr
223bd86f18
Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev
...
First pass on major conversion of xenomorphs to a human subspecies. Additional condensing of various redundant mob verbs.
Converted larva and diona to their own class, collapsed the rest of xenomorphs into a human species, other stuff.
Completely removed attack_alien(). Still have to reimplement some of the lost behavior for human/alien.
Reapplies lost attack_alien() functionality other than tackling/caressing.
Further alien/humanoid cleanup and xenospawn fix-ups. Also uncommented caste verbs.
Removed half-finished abilities system since species.dm handles it.
All xenomorphs functionality should be working now, other than the HUD, tackling and the xenomorph balance issues.
Added icons for xenomorph castes, moved broadcast languages into datums, removed alien_talk and robot_talk vars.
Merged with organ removal code.
Reapplied verbs to simple_animals/slimes. Updated species definitions to have appropriate organs.
Readded tackle as a human verb.
Borer changes regarding brain removal.
Working on moving the human HUD to the species datum a bit. Mixed results.
Moved Cortical Link to a language, added borer husks.
Tidied up the HUD stuff. Still need to make it rebuild properly when species is changed, but this will do for no
Compile fix, forgot the DME.
Fixed up ventcrawl, added new organ mechanics for dionaea.
Fixed up some overlooked sections causing mobs without brains to die immediately.
Fixed up plasma generation for queens, bugs with organs, force_organ issues with set_species().
2014-09-29 06:19:26 +09:30
Zuhayr
9fcde12b4f
Organ rewrite mapclean attempt.
2014-09-29 06:18:58 +09:30
Hubblenaut
109ef9ac89
Adds gambling tables
2014-09-28 21:48:57 +02:00
Zuhayr
cc52be3192
Merge resolution, replaced 2 wires lost in map merge.
2014-09-25 23:54:24 +09:30
Zuhayr
9272bc4542
Fixes #6351 and #6350 .
2014-09-25 21:19:35 +09:30