Zuhayr
305416d5c5
Merg resolution.
2014-10-02 02:33:06 +09:30
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
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
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
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
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
Hubblenaut
c783549015
Option to withdraw chargecard or cash at ATM
2014-09-28 21:53:19 +02:00
Hubblenaut
e7620cd81a
Spacecash is now stackable and called 'Thalers'
2014-09-28 21:52:56 +02:00
Jarcolr
6a3f5d24d8
Adds 5 approved custom items to code
...
http://baystation12.net/forums/viewtopic.php?f=33&t=11097
http://baystation12.net/forums/viewtopic.php?f=33&t=11138
http://baystation12.net/forums/viewtopic.php?f=33&t=11300
http://baystation12.net/forums/viewtopic.php?f=33&t=11337
2014-09-28 21:31:24 +03:00
Chinsky
6eea41bcc1
Merge pull request #6535 from Hubblenaut/master
...
Fixes rolled down jumpsuits not adjusting body flags
2014-09-28 21:22:00 +04:00
Zuhayr
97801b4617
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-09-29 00:39:43 +09:30
Hubblenaut
79c0d3470a
Fixes non-used flavor text causing line breaks
2014-09-28 15:48:39 +02:00
Hubblenaut
1212338c2e
Fixes rolled down jumpsuits now adjusting body flags
2014-09-28 15:48:38 +02:00
Zuhayr
afdcb1f564
Merge pull request #6518 from faerindel/adv_scanner_print
...
Adds printing occupant status option to bodyscanners.
2014-09-28 22:15:15 +09:30
Zuhayr
9a01da0519
Merge pull request #6437 from atlantiscze/Supermatter-O2-Fix
...
Supermatter Tweak
2014-09-28 22:12:21 +09:30
Chinsky
a2351ab952
Merge pull request #6529 from mwerezak/language
...
Fixes #6520
2014-09-27 14:21:29 +04:00
mwerezak
7a2b3b6661
Fixes #6520
2014-09-27 03:00:26 -04:00
Mordeth221
4e8f57cd2d
Added helm for use in events and other things
2014-09-26 17:30:41 +01:00
igalan
52caa42e8e
Split fetching data and its formatting to separate procs.
2014-09-26 00:50:05 +01:00
Zuhayr
cc52be3192
Merge resolution, replaced 2 wires lost in map merge.
2014-09-25 23:54:24 +09:30
Zuhayr
b78e2b0c79
Fixes #6297
2014-09-25 21:49:20 +09:30
Zuhayr
9272bc4542
Fixes #6351 and #6350 .
2014-09-25 21:19:35 +09:30
Zuhayr
c232b4e921
Fixes #5451 by stealing JimTheCactus' and VampyrBytes' work - thanks dudes.
2014-09-25 20:07:11 +09:30
Zuhayr
cddbce688d
Fix for potential infinite splint farming exploit in previous commit.
2014-09-25 19:43:17 +09:30
Zuhayr
e41c584ace
Fixes #6325
2014-09-25 19:33:46 +09:30
Zuhayr
6bdf515ef3
Makes species mutation a bit easier.
2014-09-25 18:48:29 +09:30
Zuhayr
7682711442
Fixes #6474
2014-09-25 18:45:27 +09:30
Zuhayr
8e9fc05b67
Fixes #6484
2014-09-25 18:36:25 +09:30
Zuhayr
b32d25b1bd
Fixes #6503
2014-09-25 18:01:46 +09:30
Zuhayr
4e6afd282c
Fixes #6488
2014-09-25 17:59:28 +09:30
Chinsky
69ed2317bf
Merge pull request #6428 from atlantiscze/cyborg-power
...
Cyborg power overhaul
2014-09-25 00:19:13 +04:00
Atlantiscze
e7f3533158
Cyborg Lights
...
- Cyborg lights now use the reworked power system.
- Removed flashlight from cyborg modules, replaced with integrated light.
- "toggle-lights" verb is added for cyborgs, which de/activates the integrated light. Uses 30W (*modifier) of power when active.
- Cyborg lights have luminosity of 6 (flashlight has 4).
2014-09-24 09:41:19 +02:00
Zuhayr
0c83a95b90
Large merge resultion. Used remote for map conflicts.
2014-09-23 21:41:54 +09:30
Zuhayr
29c29cd408
Merge pull request #6482 from PsiOmegaDelta/pAI
...
pAI submission process change
2014-09-23 18:33:38 +09:30
Chinsky
7fcc04dc90
Merge pull request #6467 from mwerezak/stungloves
...
Removes Stungloves
2014-09-21 23:19:15 +04:00
Chinsky
1d3b1e6467
Merge pull request #6483 from GinjaNinja32/shelf
...
Fix for non-cancelable book removal from bookshelves
2014-09-21 23:18:42 +04:00
Chinsky
c46067ff59
Merge pull request #6472 from mwerezak/evidence-bags
...
Fixes Evidence Bags
2014-09-21 23:15:36 +04:00
