PsiOmegaDelta
afd526126d
Fire extinguisher fixes and tweaks
...
Port of https://github.com/PolarisSS13/Polaris/pull/713 .
2016-01-08 14:47:18 +01:00
Hubblenaut
a89c066905
Fixes onmob icons for holders
...
Conflicts:
code/game/objects/items.dm
2016-01-08 14:47:08 +01:00
Dibasic
e9dac928b0
Cold air shiver typo fix
2016-01-08 14:46:58 +01:00
PsiOmegaDelta
f9b61ed1ec
Merge pull request #11943 from Baystation12/dev-freeze
...
Dev
2016-01-08 14:27:32 +01:00
PsiOmegaDelta
cf463ffd48
Merge pull request #11942 from Baystation12/master
...
Dev-freeze
2016-01-08 13:59:21 +01:00
PsiOmegaDelta
8ea8c342bc
Merge pull request #11940 from comma/pixelhunt
...
Makes inventory slots forward clicks to items in them
2016-01-08 13:37:47 +01:00
Chinsky
4de4cac9be
Makes inventory slots forward clicks to items in them. In effect that means you don't have to pixelhunt item in the slot, just click the slot. Smoking cigs is easy mode now.
2016-01-08 09:08:44 +03:00
Ccomp5950
97c0635fad
Merge pull request #11927 from comma/devfix
...
Devfixes
2016-01-07 13:03:26 -05:00
Chinsky
7b4289e072
Macro for intent
2016-01-07 19:40:50 +03:00
Chinsky
0d7c52b869
Fixes #11884
2016-01-07 07:07:45 +03:00
Chinsky
f0678854ec
Fixed monkey scooping. Again.
2016-01-07 07:06:20 +03:00
Nicolai Czempin
f040b221b0
Cleanbot cleans closest dirt first
2016-01-06 14:51:01 +01:00
RavingManiac
6e82dfa381
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2016-01-04 19:25:36 +08:00
Ccomp5950
7dc9b3487a
Merge pull request #11739 from PsiOmegaDelta/151214-ObserveThis
...
Qdel() tweaking and a bonus
2016-01-01 23:58:29 -05:00
Mustafa Kalash
73436d6cfd
Fixes another problem with be75349. Should be for real this time.
2016-01-01 16:31:04 -05:00
Mustafa Kalash
6e23584e69
Fixes #11776 . Fixes error in be75349.
2016-01-01 16:20:02 -05:00
Mustafa Kalash
be753497d0
Fixes #11801 .
2016-01-01 15:35:17 -05:00
PsiOmegaDelta
253a4bc3d0
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2016-01-01 13:15:51 +01:00
PsiOmegaDelta
4ed1e118fc
Merge pull request #11861 from Baystation12/master
...
Dev-freeze
2016-01-01 13:14:21 +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
PsiOmegaDelta
96cbc225ff
Bags with the auto-pickup ability can no longer grab anchored objects.
...
Also fixes the canUnEquip() proc. It now only checks state, it doesn't change it. Fixes #11819 and probably a couple other odd item interactions.
2015-12-30 11:28:54 +01:00
Chinsky
163473a153
Merge pull request #11813 from PsiOmegaDelta/151229-ResomiBaseMob
...
Can now spawn Resomi.
2015-12-29 17:42:27 +03:00
PsiOmegaDelta
a9e1bab519
Can now spawn Resomi.
...
QoL addition, little more.
2015-12-29 14:27:34 +01:00
Zuhayr
4da9f6df70
Merge pull request #11767 from Loganbacca/devfix
...
Fixed player setup issues
2015-12-29 23:47:31 +10:30
GinjaNinja32
45d3d843f7
Merge pull request #11806 from Zuhayr/devfix
...
Fixes.
2015-12-29 07:06:31 +00:00
Zuhayr
f7109f8fa8
Cleaning up some holder/scoop/climbing code.
2015-12-29 16:10:27 +10:30
GinjaNinja32
5296f7458a
Merge pull request #11798 from Ccomp5950/sleepy_emotes
...
Involuntary emotes no longer check if you are conscious.
2015-12-29 04:56:34 +00:00
GinjaNinja32
60a6fe9513
Merge pull request #11799 from Ccomp5950/merge_fix
...
Fix previous merge conflict oopsie.
2015-12-29 04:55:49 +00:00
Loganbacca
b94fa98170
Tweaked a couple of fixes
2015-12-29 16:41:59 +13:00
ccomp5950
dd2db22e64
Fix previous merge conflict oopsie.
...
1b10f78940
2015-12-28 19:31:14 -05:00
ccomp5950
cf0320ee14
Involuntary emotes no longer check if you are conscious.
...
Fixes : #11791
Unconcious folks don't scream.
2015-12-28 18:40:44 -05:00
PsiOmegaDelta
66112636c8
Human blindness status should now be reset to 0 before any updates, preventing them from being left permanently blind.
...
Fixes #11771 .
2015-12-28 22:38:58 +01:00
PsiOmegaDelta
91dbf027d0
Synths can now speak EAL.
2015-12-28 20:53:31 +01:00
PsiOmegaDelta
14381dfd87
Makes the AI/Malf status entries consistent with the rest of the mob stat entries.
2015-12-28 20:50:07 +01:00
PsiOmegaDelta
82a51505cf
The binary channel will now be listed using the user's primary language key, instead of :
2015-12-28 20:37:05 +01:00
PsiOmegaDelta
4d83861b85
Synths can now understand the language of the resomi.
...
Fixes #11778 .
2015-12-28 20:15:17 +01:00
Loganbacca
4b1f87ae12
Fixed dionae preview icon issues
2015-12-28 22:05:51 +13:00
Loganbacca
358a85a179
Preview icon fixes
...
- Fixes preview icon not updating with skin/hair/eye colour, and underwear selection
- Fixes bug causing blank underwear and undershirt selection after randomizing
2015-12-28 21:25:14 +13:00
Sebastian Broberg
14393ea706
Few refraction
2015-12-27 17:05:08 +01:00
PsiOmegaDelta
00b556e768
Merge pull request #11762 from Baystation12/dev-freeze
...
Dev
2015-12-27 16:10:04 +01:00
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
PsiOmegaDelta
7123044b3e
Merge pull request #11736 from Baystation12/dev-freeze
...
Dev
2015-12-23 11:38:51 +01:00
PsiOmegaDelta
f54dd94a66
Merge pull request #11735 from Baystation12/master
...
Dev-freeze
2015-12-23 11:33:35 +01:00
Atlantis
9fa1513647
Fixes AI's Examine()
...
- Message about AI's backup power now only show when the AI still lacks external power.
2015-12-23 00:57:54 +01:00
Zuhayr
b6984d9a20
Added checks for character age to numerous jobs.
...
Conflicts:
code/game/jobs/job/assistant.dm
2015-12-22 13:24:12 +01:00
