Crazy Lemon
dc590ac8ec
Merge pull request #6522 from Kyep/playtime_runtime_fix
...
Adds checks to prevent runtime in playtime list if mob has no mind
2017-02-21 11:56:55 -08:00
Fox McCloud
e677041a3c
Merge pull request #6554 from Crazylemon64/dna_runtime_fix
...
Fixes runtime when non-dna'd mobs step on a rad mine
2017-02-21 13:50:44 -05:00
Crazylemon64
6b26ac0471
Fixes runtime when non-dna'd mobs step on a rad mine
2017-02-21 04:39:58 -08:00
Crazylemon64
69ece3d12e
Makes autolathe hacking work again
2017-02-21 02:19:00 -08:00
Crazy Lemon
a3d3f71a71
Merge pull request #6511 from davipatury/autolathe-ui
...
Autolathe Nano-UI-ification
2017-02-20 20:08:42 -08:00
Fox McCloud
8cefd77287
Merge pull request #6517 from Markolie/stonedchaplain
...
Gives the chaplain a soulstone on the Cyberiad
2017-02-20 09:46:53 -05:00
Kyep
edfd178e35
Line condense
2017-02-19 15:16:28 -08:00
Fox McCloud
f8c87965f0
Merge pull request #6521 from Markolie/fixxxxx
...
Fixes constructable frames eating all glass stacks
2017-02-19 11:35:20 -05:00
Kyep
d14ee50ccd
Adds checks to prevent runtime in playtime list if mob has no mind
...
Currently, if you use 'Check Player Playtime' before roundstart, you can
get a runtime like this:
[07:00:59] Runtime in job_exp.dm,16: Cannot read null.assigned_role
proc name: Check Player Playtime
(/client/proc/cmd_mentor_check_player_exp)
usr: CHARACTER (CKEY) (/mob/dead/observer)
usr.loc: The floor (41,145,1) (/turf/simulated/shuttle/floor)
This PR fixes it so that runtime should no longer be possible, by
checking that C.mob.mind exists before checking whether
C.mob.mind.assigned_role exists.
2017-02-19 04:04:16 -08:00
Markolie
3ab6292aae
Fix stacks in constructable frames
2017-02-19 12:51:22 +01:00
Markolie
4a49faa046
Change cultist check to prevent metagaming, update message
2017-02-19 12:36:38 +01:00
davipatury
7af8959bda
oops
2017-02-18 19:39:41 -02:00
davipatury
337a346284
Autolathe nano-ui.
2017-02-18 19:11:52 -02:00
Markolie
98140635f0
Fix secure vending machine and newscaster interaction
2017-02-18 19:09:24 +01:00
Mark van Alphen
f42b9cf383
Merge branch 'master' into admin_interact
2017-02-18 15:41:16 +01:00
Fox McCloud
ce50279b73
Merge pull request #6436 from Kyep/playtime_for_mentors
...
Lets mentors see playtime
2017-02-18 08:29:25 -05:00
Fox McCloud
b2fe0bd74f
Merge pull request #6240 from Markolie/stationgoals
...
Ports Station Goals from /tg/
2017-02-17 12:12:11 -05:00
Fox McCloud
b78f83a153
Merge pull request #6451 from Crazylemon64/borer_patches
...
Adds a few patches to borer to not fling datums to the GC
2017-02-17 12:07:42 -05:00
Mark van Alphen
dea264faf2
Merge branch 'master' into stationgoals
2017-02-17 18:05:15 +01:00
Krausus
4754d6b4b3
Fixes some sounds not being cached properly
2017-02-17 02:37:26 -05:00
Kyep
7c0eb7a853
CPP now lists jobs, with * on jobs with p.reqs
2017-02-16 23:31:28 -08:00
uraniummeltdown
1a0d8a601a
only living mobs can squeak bananium tiles
2017-02-16 22:35:34 +04:00
uraniummeltdown
c661609076
Merge remote-tracking branch 'remotes/upstream/master' into rodform
...
# Conflicts:
# icons/mob/actions.dmi
2017-02-15 15:56:36 +04:00
Crazylemon64
ed7f1d73a0
performance memes
2017-02-15 02:40:25 -08:00
Crazylemon64
ba54cd81d5
Adds a few patches to borer to not fling datums to the GC
2017-02-14 23:50:19 -08:00
Crazy Lemon
e89bbcd9c1
Merge pull request #6330 from FlimFlamm/box_sprite_addition
...
Large Cardboard Box Decals/Sprites
2017-02-14 23:12:41 -08:00
Crazy Lemon
d26835747b
Merge pull request #6103 from uraniummeltdown/borerimprove
...
Better Borers
2017-02-14 21:43:56 -08:00
Crazy Lemon
35653d0cee
Merge pull request #6380 from uraniummeltdown/tanksprites
...
New Tank Sprites
2017-02-14 21:32:53 -08:00
Crazy Lemon
10d38bb4b2
Merge pull request #6445 from Twinmold93/blobfix
...
Fixes Blob Conscious Split Decreasing Scaling
2017-02-14 20:33:01 -08:00
Crazy Lemon
de73349f16
Merge pull request #6359 from Fox-McCloud/advanced-camera-fixup
...
Advanced Camera Speedup, features, and sound.
2017-02-14 13:38:34 -08:00
Crazy Lemon
2e6f341f70
Merge pull request #6388 from DrunkDwarf/rcd-airlock-name2
...
Allows the Rapid Construction Device to set the name of a constructed Airlock
2017-02-14 13:34:21 -08:00
Crazy Lemon
eaa0316eed
Merge pull request #6434 from Kyep/check_antags_ert
...
Adds ERT to Check Antagonists
2017-02-14 13:24:12 -08:00
Crazy Lemon
3fdfde6767
Merge pull request #6443 from Markolie/fixxxxx
...
Fix KA reskin mods and welding tool inhand
2017-02-14 13:23:22 -08:00
Crazy Lemon
faa041220d
Merge pull request #6439 from VampyrBytes/God-Emperor
...
The God Emperor lives on!
2017-02-14 13:09:11 -08:00
uraniummeltdown
60e61db55f
ports rod form wizard spell from tgstation
2017-02-14 21:05:08 +04:00
Twinmold
a2b01153a2
Fixes Blob Conscious Split Decreasing Scaling
...
Makes it so that when a blob uses the Conscious Split verb, it no longer
sets it to 700 (350*2), but instead increases the current requirement by
350 (the initial amount) before the blobs can win. This gives blobs the
chance to make more cores and in turn theoretically reach that limit
quicker (and also gives them a chance to increase their play-time as
blob), but if they lose cores, they have much more work ahead of them to
make up for that loss.
Fixes #6372
:cl:Twinmold
Fix: Blob Conscious Split now properly scales the requirement of blob
tiles to win.
/🆑
2017-02-14 04:51:19 -06:00
Kyep
b7855481f6
Fixes & Improvements
...
- Makes new players be listed first in the Check Playtime list, so they
are easy to find.
- Fixes a bug with mentor playtime list not actually working for
mentors.
- Fixes the Check Player Age panel not having working "FLW" links, and
potentially showing antag status to mentors.
2017-02-13 23:12:57 -08:00
Kyep
cdf35ce9da
fixes merge conflict
2017-02-13 22:27:06 -08:00
Aurorablade
321c1801bd
RRRRRRRRRRRRRREEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
2017-02-14 00:51:32 -05:00
Aurorablade
d461b46f91
dunno why its hcnageing lines on this
2017-02-14 00:28:58 -05:00
Aurorablade
55db3a41a0
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Bugsie4
2017-02-13 22:40:09 -05:00
Aurorablade
5bc07df8cb
Revert "......TIGERCATTTTT!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!111111111111111111111111111"
...
This reverts commit fdf02fc2a0
2017-02-13 21:44:11 -05:00
Markolie
078ca5dd92
Fix examine
2017-02-13 19:30:22 +01:00
Markolie
5c177320c3
Fix remaining welding tool inhands
2017-02-13 19:26:18 +01:00
Markolie
e3eac9cdc7
Fix KA reskin mods and welding tool inhand
2017-02-13 19:12:26 +01:00
uraniummeltdown
c4dd6f533f
Merge remote-tracking branch 'remotes/upstream/master' into tanksprites
...
# Conflicts:
# icons/mob/inhands/items_lefthand.dmi
# icons/mob/inhands/items_righthand.dmi
2017-02-13 21:01:58 +04:00
VampyrBytes
738ebac765
The God Emperor lives on!
...
Fixes #6404
There were 2 issues here.
Firstly I'm guessing that UI has grown in length since this disk was
made... the UI on the disk only had a length of 24 instead of 32 which
was leading to a list out of bounds runtime. Fixed with a loop adding
0x000 to the end to prevent this happening again if the UI length
changes again
Secondly, even though it's a UI&UE disk, the dna record on it still
needed SE for it to work - Clean SE now added to it
2017-02-13 15:03:20 +00:00
Fox McCloud
b3c9912ea0
Merge pull request #6438 from Kyep/iaa_bugfix
...
Fixes an IAA bug
2017-02-13 06:25:05 -05:00
Kyep
d60c060758
Fixes an IAA bug
...
Fixes a missing definition that was meant to be added in
https://github.com/ParadiseSS13/Paradise/pull/6412
2017-02-13 03:18:19 -08:00
Fox McCloud
69eae328d3
Merge pull request #6386 from uraniummeltdown/nukedeclaration
...
Custom War Declaration
2017-02-13 06:12:31 -05:00
