Zuhayr
79e06e5ad4
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2016-01-20 08:33:56 +10:30
Zuhayr
e557a71fdc
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12
2016-01-20 08:01:14 +10:30
Yoshax
f87b120dd5
Fixes #796
2016-01-19 19:11:05 +00:00
Earthcrusher
41df41e549
Adds two new sounds little borgie butts can make, *yes and *no.
2016-01-19 12:59:00 -06:00
Szunti
2f93947e59
Simplify slime temperature damage
...
Currently the damage-temperature curve is not continuous and isn't monotone.
It's better to change it to constant 30 damage between -50°C and 50K.
The exact shape of the function is not that important, because the slimes
resistance is mostly due to its bodytemperature need time to change.
2016-01-18 13:57:45 +01:00
Yoshax
b558fb795f
Changes observe message to reflect correct respawn timer
2016-01-16 23:10:15 +00:00
Zuhayr
887c174926
Fixes #260
2016-01-14 00:17:50 +10:30
Zuhayr
1702765073
Hackfix for impossible-to-remove cuffs.
2016-01-12 16:27:15 +10:30
Zuhayr
40b7c087c9
Attempting to fix perma-wet-floors bugs.
2016-01-12 15:50:20 +10:30
Datraen
e77a06e176
Merge pull request #748 from Zuhayr/prosthetics
...
Blindness fix.
2016-01-08 23:09:03 -05:00
Zuhayr
905cb5943d
Readds blindness removal to imida
...
zoline and organ surgery. Stops imidazoline healing robotic eyes.
2016-01-09 13:24:46 +10:30
EmperorJon
14e060f1a6
Merge pull request #743 from Zuhayr/showfix
...
Several fix ports, minor show_messages inclusion.
2016-01-09 02:05:58 +00:00
Zuhayr
8416cd976f
More thorough fix for FBP immortality.
2016-01-09 12:11:12 +10:30
PsiOmegaDelta
cf463ffd48
Merge pull request #11942 from Baystation12/master
...
Dev-freeze
2016-01-08 13:59:21 +01:00
Zuhayr
1579f4c724
Removing a world that snuck back in after rebase.
2016-01-08 23:20:53 +10:30
Zuhayr
f045c62821
Rewriting some pull logic.
2016-01-08 23:20:40 +10:30
Zuhayr
baf1e4315e
Generalized pulling restrictions to mob level.
2016-01-08 23:20:30 +10:30
Zuhayr
b174b68e0a
Holders now pass on their contained mob's ID card.
2016-01-08 23:18:42 +10:30
Zuhayr
80e4235c68
Unifying mob scooping, removing some unneeded boilerplate.
2016-01-08 22:17:05 +10:30
Zuhayr
763a4b88e7
Allows held mobs to see messages.
2016-01-08 21:40:02 +10:30
Datraen
90b1e14841
Fixes #685 .
2016-01-07 21:30:33 -05:00
Datraen
2494df8b1d
Merge pull request #731 from Zuhayr/ipcscreen
...
Display monitors and manufacturer fixes.
2016-01-07 12:34:03 -05:00
Zuhayr
a5227c9904
Merge pull request #698 from Hubblenaut/master
...
Changes to Confused Moving
2016-01-08 00:52:35 +10:30
Zuhayr
99941146f5
Merge pull request #729 from Hubblenaut/wheelchair
...
Wheelchair fixes
2016-01-08 00:51:39 +10:30
Nicolai Czempin
f040b221b0
Cleanbot cleans closest dirt first
2016-01-06 14:51:01 +01:00
Dibasic
4573b22922
Cold air shiver typo fix
2016-01-06 00:37:10 -06:00
Zuhayr
51deb6cd7e
Made old IPC icons into a mask slot item for prosthetic heads.
2016-01-05 16:20:42 +10:30
Hubblenaut
61e31ab8ad
Wheelchair fixes
2016-01-05 00:56:57 +01:00
Zuhayr
bda43c7457
Merge pull request #713 from Woodratt/1.4.0_Extinguisher_fix
...
1.4.0 Fire extinguishe fixes and tweaks
2016-01-03 19:20:56 +10:30
Datraen
8e70e4e91a
Merge pull request #709 from SinTwo/New_PDA_Sprites
...
New PDA Sprites
2016-01-02 23:29:36 -05:00
PsiOmegaDelta
2e89b7c718
Fixes the canUnEquip() proc.
...
It now only checks state, it doesn't change it. Fixes a number pf odd item/bag interactions.
2016-01-02 16:59:16 +01:00
Zuhayr
447d0e74ce
Added a colour selector to the floor painter, added the floor painter to the construction and drone modules.
2016-01-02 07:05:45 +10:30
PsiOmegaDelta
4ed1e118fc
Merge pull request #11861 from Baystation12/master
...
Dev-freeze
2016-01-01 13:14:21 +01:00
woodratt
300cafd987
1.4.0 Fire extinguishe fixes and tweaks
...
- Tweaks the amount that fire extinguisher holds and particles they send out. According to Spookerton there's no advantage to having more than 3 particles. In tests this seems to be the case as well.
- Also a minor edit to the code for patting people out that are on fire (as suggested by Spookerton), should help with folks that get set on fire.
- Added more fire extinguishers through medical.
-- One note -- Found in testing the fire extinguishers, water on tiles does not go away over time. Fire extinguishers appear to spray water on the tiles. Didn't know a way around this or how to fix this.
2015-12-31 20:57:18 -08:00
Zuhayr
3044496ae9
Attempting to limit object checks.
2016-01-01 12:25:30 +10:30
Zuhayr
e3735bfbee
Cleaning up some holder/scoop/climbing code.
2016-01-01 10:30:05 +10:30
SinTwo
b0916167c0
Adds new PDA sprites.
2015-12-31 15:19:11 -05:00
Hubblenaut
75c78fc3c9
Changes to Confused Moving
2015-12-31 02:28:35 +01:00
Chinsky
7ad106349c
Merge pull request #11749 from headswe/soulstone_fix
...
Fixes #11711 & Refractors soulstone.dm
2015-12-31 00:36:14 +03:00
Neerti
59c1773286
Merge pull request #687 from Datraen/EAL-Speaker-Tweak
...
EAL given to Cyborgs, AI and pAI.
2015-12-28 23:47:41 -05:00
Datraen
48d0d6bb39
EAL given to Cyborgs, AI and pAI.
2015-12-28 20:32:41 -05:00
Sebastian Broberg
14393ea706
Few refraction
2015-12-27 17:05:08 +01:00
Zuhayr
1617a43685
Applying Harpy's prosthetic limb damage fix.
2015-12-27 17:27:19 +10:30
mwerezak
b30f81c7ea
Fixes #11381
2015-12-27 01:28:41 -05:00
Sebastian Broberg
370529bc42
Refractored soulstone.dm
...
Split the various functions of the proc into multiple procs
Moved the transfer_soul proc under the soulstone object.
2015-12-25 13:04:13 +01:00
Sebastian Broberg
b000ca4eb7
Boop, logic escaped me also refractor this shit someone.
2015-12-25 11:30:33 +01:00
GinjaNinja32
7cca8416b3
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-12-25 03:41:33 +00:00
GinjaNinja32
04006f5b9e
fix human examine gender
2015-12-25 01:06:35 +00:00
Sebastian Broberg
ebef6272b9
Fixes #11711
...
Should fix it.
2015-12-24 23:02:37 +01:00
Zuhayr
8602f07d31
Allowed grenades to be stuffed into mouths and primed.
2015-12-24 21:55:05 +10:30
