Fox McCloud
86eac97aa7
Merge pull request #5902 from shazbot194/master
...
fix for l6 description and paper hat sprites
2016-11-23 16:26:07 -05:00
shazbot194
0cd9a555cd
Fixing my error
...
It apears the code I am using is a little old and didn't have a fix fox
made.
2016-11-23 02:31:42 -09:00
shazbot194
95f381f0f7
Smaller fix for paper
...
turns out I made an error when testing, this is a proper fix for the in
hand item
2016-11-23 00:31:14 -09:00
shazbot194
00444598d9
fix for l6 description and paper hat sprites
...
Changes the description of the L6 from 7.62 to 5.56 so it matches both
its ammo and magizine caliber.
Adds in paper_words sprites to head, and hands so when you have a paper
that is writen on, it can both be seen when holding and when wearing as
a hat.
2016-11-22 11:16:32 -09:00
KasparoVy
30a8a5feb3
Fixes Disability/Shock Stuttering, Resolves #5899 ( #5900 )
...
* Fixes Stutteing.
The 0 argument was busting this proc because it meant that the current
value of stuttering would be the only one stuttering would ever get set
to through SetStuttering. It didn't even use the 'amount' value.
This fixes it as per the way it used to be
6a7f7394a8 (diff-2de2df982739a4fbdb54a4b2715d6f92L114)
2016-11-21 21:59:31 -08:00
Crazy Lemon
405fe1bb54
Merge pull request #5842 from Fox-McCloud/reagent-reorganization
...
Reagent Reorganization
2016-11-21 16:54:41 -08:00
Crazy Lemon
f215041315
Merge pull request #5893 from Fox-McCloud/event-cleanup
...
Removes Event Procs
2016-11-21 16:51:16 -08:00
Fox-McCloud
9ace0245cf
Removes Event Procs
2016-11-16 07:14:08 -05:00
FlattestGuitar
10476052d8
removes the weird thingy
2016-11-15 14:42:56 +01:00
FlattestGuitar
e224919844
Merge branch 'cap-fluff' of https://github.com/FlattestGuitar/Paradise into cap-fluff
2016-11-15 14:41:57 +01:00
TheDZD
220ed7b27b
Merge pull request #5872 from Fox-McCloud/bsa
...
BSA Tweaks
2016-11-13 20:27:27 -05:00
TheDZD
9807576359
Merge pull request #5875 from Fox-McCloud/vision-fix
...
Fixes Simple Mobs Attacking Pods/Mechs Across Z-Levels
2016-11-13 19:52:24 -05:00
Mieszko Jędrzejczak
b25e9ca261
floofs
2016-11-14 01:42:30 +01:00
Fox McCloud
497cbad899
Merge pull request #5788 from Markolie/randomfixes
...
Fixes
2016-11-13 19:26:02 -05:00
Crazylemon64
5bf1ad3a18
Vision no longer blinks the blur overlay if your eyes are hurt
2016-11-12 14:14:20 -08:00
TullyBurnalot
71b64bbb5a
Fixes Gun Renaming
...
- Renaming guns now only produces 1 input box
2016-11-12 01:32:50 +00:00
Fox-McCloud
55ffd16db8
Fixes Telekinetic Simple Mobs
2016-11-11 10:39:50 -05:00
Fox-McCloud
feecce9d2e
OOP blacklist
2016-11-10 21:59:19 -05:00
Markolie
0db6c7cb19
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into randomfixes
...
# Conflicts:
# code/game/machinery/cryo.dm
2016-11-10 17:56:14 +01:00
Fox-McCloud
954e7b3c5d
more cleanup
2016-11-10 06:28:28 -05:00
Fox-McCloud
d809645f18
proc fix
2016-11-09 22:44:15 -05:00
Fox-McCloud
1d869d31c1
avoiding conflicts
2016-11-09 22:42:43 -05:00
Fox-McCloud
fcc20ac6bc
BSA Tweaks
2016-11-09 22:36:03 -05:00
TheDZD
5d41e856ec
Merge pull request #5871 from Fox-McCloud/paper-item-state
...
Fixes Paper's In-hand Icon
2016-11-09 20:49:22 -05:00
Fox-McCloud
a880f740d2
Fixes Paper's In-hand Icon
2016-11-09 20:38:16 -05:00
KasparoVy
0f1ae264f8
Resolves a runtime with alt icons.
...
The runtime occurred when get_icon_state() attempted to handle_alt_icon
on a head, even if if was a stump. Adds sanity to check if it's a stump
or if the organ's destroyed (as how it's handled in update_icons for
mobs) and resolves the runtime and #5863 .
2016-11-09 04:28:51 -05:00
Fox-McCloud
14e2eb8eb0
consumables
2016-11-08 10:26:29 -05:00
Fox-McCloud
b1b78ec3ee
nutrition fix
2016-11-08 06:48:24 -05:00
Fox-McCloud
46887e88d8
fixes
2016-11-08 06:41:48 -05:00
Crazylemon64
6ec712df8c
Fixes defib leaving people in deadchat, n2o paralyse time
2016-11-06 21:36:24 -08:00
Fox-McCloud
36e84ccdf7
further structure
2016-11-06 15:02:25 -05:00
Fox-McCloud
61da53cca1
create reagents proc
2016-11-06 14:37:47 -05:00
Fox McCloud
1e47d33d65
Merge pull request #5852 from Markolie/grammarnazi
...
PA wording fixes
2016-11-06 12:04:06 -05:00
Markolie
b77da4511e
PA wording fixes
2016-11-06 16:44:54 +01:00
Fox-McCloud
77c6460bfe
drinking glass refactor
2016-11-06 02:02:08 -05:00
TheDZD
ed47038446
Merge pull request #5846 from Fox-McCloud/stun-fixes
...
Fixes Xeno Stuns
2016-11-05 18:19:36 -04:00
Fox McCloud
288483ee52
Merge pull request #5838 from Markolie/grammarnazi
...
Fixes
2016-11-05 01:12:41 -04:00
Fox-McCloud
c0e4b5bdc9
Fixes Xeno Stuns
2016-11-05 00:46:07 -04:00
Crazylemon64
3cdfbbe352
Fixes a couple incorrect research prereq specifications
2016-11-04 12:24:32 -07:00
Fox-McCloud
710e0e1005
oops
2016-11-04 14:38:18 -04:00
Fox-McCloud
0cfcfb4c32
repathing
2016-11-04 14:26:50 -04:00
Fox-McCloud
ebb59ca511
Reagent Reorganization
2016-11-03 21:27:10 -04:00
Markolie
182cd3a0de
Fix catwalk/plating issue, update Experimentor grammar and remove disabilities from nuke ops
2016-11-02 13:17:35 +01:00
Fox McCloud
657e1649b3
Merge pull request #5829 from Markolie/plantfix
...
[s]Add cooldown to the plant analyzer print
2016-10-30 22:42:31 -04:00
Fox McCloud
911fa70e1a
Merge pull request #5601 from Crazylemon64/status_effect_overhaul
...
Ports over the status effect unification from the extreme refactor
2016-10-30 22:40:24 -04:00
Fox McCloud
f67bccb444
Merge pull request #5764 from Markolie/teg2
...
TEG refactor
2016-10-30 19:56:26 -04:00
Markolie
a77b690b02
Add cooldown to the plant analyzer print
2016-10-30 16:41:17 +01:00
TheDZD
eb21043b9a
Merge pull request #5815 from Fox-McCloud/food-refactor
...
Food refactor
2016-10-28 22:37:19 -04:00
Fox McCloud
c3857dc865
Merge pull request #5819 from Markolie/ezfix
...
Fixes
2016-10-27 11:44:08 -04:00
Fox-McCloud
d2cb6a2844
oops
2016-10-27 10:44:54 -04:00
