Commit Graph

9413 Commits

Author SHA1 Message Date
Mloc
37b5aa1c50 fixes #6035
Signed-off-by: Mloc <colmohici@gmail.com>
2014-10-02 13:26:28 +01:00
Zuhayr
61c0f6e1b7 Merge pull request #6574 from Mloc/bs12-fan
more fixes
2014-10-02 19:04:07 +09:30
Zuhayr
c3c5c68890 Merge pull request #6576 from GinjaNinja32/anomaly
Changes Alden-Saraspova behaviour to wait for new results before outputting
2014-10-02 12:17:52 +09:30
Zuhayr
a0ad04f520 Merge pull request #6564 from TwistedAkai/master
Add round start check to Declare Ready
2014-10-02 11:44:07 +09:30
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
mwerezak
56433c891b Cleans up used_radios
The used_radios handling was too specific to be in mob/living/say.
Subtypes had to figure out what to pass for used_radios anyways, they
can also decide how to handle radio use (or if talking into radios even
applies to their mob type).
2014-10-01 20:14:03 -04:00
GinjaNinja32
2b16022ee0 Changes Alden-Saraspova counter behaviour to wait for new results before outputting 2014-10-01 22:32:45 +01: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
58953a3d31 fixes #6499
Signed-off-by: Mloc <colmohici@gmail.com>
2014-10-01 17:48:21 +01:00
Mloc
dbff924849 fixes #6562
fixes #6571

Signed-off-by: Mloc <colmohici@gmail.com>
2014-10-01 17:48:17 +01:00
Zuhayr
3fd8b64f86 Added new diona icons, added heat to alien life(), added fire indicator. 2014-10-01 22:21:34 +09:30
Akai Alonkai
4c5665d4fd Add round start check to Declare Ready
Added a check to 'declare ready' to prevent readying up after the round
started. Allowing this to happen caused a bug where the player would be
unable to change their character setup if they declared ready after the
round started, such as to look at the manifest to see which character
would be best to play, until after reconnecting.
2014-10-01 06:16:29 -04:00
Chinsky
dd9b3fe613 Merge pull request #6565 from Mloc/bs12-fan
small fixes 2
2014-10-01 13:39:35 +04:00
Chinsky
a3dba06c0e Merge pull request #6563 from mwerezak/cargo
Fixes supply shuttle state when returning
2014-10-01 13:39:29 +04:00
Zuhayr
c3e63b1ad0 Merge pull request #6560 from Mloc/bs12-efab
small fixes
2014-10-01 18:52:59 +09:30
Mloc
d43dbaa7b5 resolves #6260
chance was being checked twice, for some reason.

Signed-off-by: Mloc <colmohici@gmail.com>
2014-10-01 10:13:15 +01:00
Zuhayr
cc21a1b405 Muzzle check/changeling check removal, thanks Harpy. 2014-10-01 18:32:24 +09:30
Mloc
39781326cc fix for artifact teleportation effect
will no longer teleport you inside random objects.

Signed-off-by: Mloc <colmohici@gmail.com>
2014-10-01 09:54:39 +01:00
Zuhayr
3f05362577 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenorewrite 2014-10-01 18:16:04 +09:30
Chinsky
a26185dd9e Merge pull request #6553 from atlantiscze/android-roundstart-fix
Android roundstart fix
2014-10-01 10:01:39 +04:00
Chinsky
165bbadc10 Merge pull request #6551 from RavingManiac/dev
Space floating effect
2014-10-01 10:01:25 +04:00
mwerezak
d81670edfb Fixes supply shuttle state when returning
When returning to centcom, the supply shuttle's state was not being set
to INTRANSIT.
2014-10-01 00:48:16 -04:00
Mloc
61394d3921 fixes #6561
Signed-off-by: Mloc <colmohici@gmail.com>
2014-09-30 22:18:25 +01:00
Zuhayr
d7e2c0fac9 Merge branch 'xenorewrite' of https://github.com/Zuhayr/Baystation12 into xenorewrite 2014-10-01 06:06:10 +09:30
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
RavingManiac
66527ab763 gravitychange() now makes all affected mobs have the floating animation unless magbooted, etc.
New mob proc Check_Dense_Object() seperated from Process_Spacemove(), checks for adjacent objects or turfs that can be pushed off, also handles magboots on gravity-less floors.
2014-09-30 23:18:04 +08: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
b411da44b8 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-09-30 23:23:05 +09:30
Chinsky
db19505e10 Merge pull request #6544 from Jarcolr/customis
Adds *5* approved custom items to code
2014-09-30 12:21:04 +04:00
Atlantiscze
ff9f79acfc Cleaner version of previous commit. 2014-09-30 09:15:21 +02:00
Atlantiscze
8d58fc2e97 Android Roundstart NameFix
- Positronic Brains in Androids now have proper posibrain-like name, instead of using MMI-like name.
- Example: (Tes Ter -> SINA-123)
2014-09-30 08:56:28 +02:00
Zuhayr
bab862f24c Readded transform procs for xenos. 2014-09-30 16:07:47 +09:30
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
f44a53fb69 Removed a debug. 2014-09-30 13:28:56 +09:30
Zuhayr
63629a953b Added Add and Remove Organ options to VV. 2014-09-30 13:23:28 +09:30
Zuhayr
70eedc3486 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenorewrite 2014-09-30 12:18:16 +09:30
Zuhayr
a0d23b3800 Reimplements ninja and cult species rarity bonuses. 2014-09-30 12:17:33 +09:30
Zuhayr
161d21f8d0 Added cuff-breaking checks for can_shred(). 2014-09-30 12:03:19 +09:30
Zuhayr
74eae5a6bd Moved radiation and light processing to organs. 2014-09-30 11:58:40 +09:30
Zuhayr
c0c4b99b34 Some prep work/support work for the alien resting icons. 2014-09-30 10:48:45 +09:30
Zuhayr
0a0e94e12e Moved human brainloss to the brain organ. 2014-09-30 10:44:56 +09:30
Zuhayr
56a2115338 Added Binary to posibrains. 2014-09-30 10:43:16 +09:30
RavingManiac
918520df83 Mobs will bob up and down in space and zero-gravity unless they are both wearing magboots and within 1 tile of a dense object/turf. 2014-09-30 01:22:13 +08:00
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