Markolie
f63a9c279c
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2
...
# Conflicts:
# code/defines/procs/announce.dm
# code/modules/events/mass_hallucination.dm
2016-10-31 14:46:58 +01:00
Fox McCloud and GitHub
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 and GitHub
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 and GitHub
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 and GitHub
eb21043b9a
Merge pull request #5815 from Fox-McCloud/food-refactor
...
Food refactor
2016-10-28 22:37:19 -04:00
Fox McCloud and GitHub
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
Fox McCloud and GitHub
66027032a4
Merge pull request #5821 from Markolie/ertfixes
...
ERT fixes
2016-10-27 10:30:23 -04:00
Markolie
a77b501ebf
Runtime fix
2016-10-27 15:03:07 +02:00
Markolie
4dcb46d295
More minor briefcase changes
2016-10-27 15:00:31 +02:00
Markolie
e9dc5b1b1f
Fix secure briefcases appearing empty
2016-10-27 14:56:58 +02:00
Markolie
afb079bf8b
Rig install adjustments
2016-10-26 12:51:48 +02:00
Fox-McCloud
bae93f08b5
cleanup further
2016-10-25 23:33:21 -04:00
Markolie
f27f72e61b
ERT fixes
2016-10-26 03:05:51 +02:00
Markolie
0725ea2cbb
Fix rig Goliath upgrade double message
2016-10-26 01:07:32 +02:00
Markolie
c30ec1c64b
Fixes Ripley Goliath upgrade occupant check
2016-10-26 00:28:28 +02:00
Fox McCloud and GitHub
7480e5917f
Merge pull request #5818 from FlattestGuitar/elishirt
...
Floof item for Eli Randolph
2016-10-25 17:52:08 -04:00
Fox-McCloud
7ca1330749
further tweaks
2016-10-25 16:46:41 -04:00
Markolie
cb8358d553
Fix SNPC runtimes
2016-10-25 21:49:17 +02:00
Mieszko Jędrzejczak
effda79a2f
adds muh shirt
2016-10-25 20:36:12 +02:00
Markolie
4ed58cc839
Remove newscast from two missed announcements
2016-10-25 19:50:05 +02:00
Markolie
1c89bcb28e
Fix spiderling remains being draggable
2016-10-25 18:43:06 +02:00
Markolie
ffc74cda0a
Announcement fixes, change most command announcements to event announcements
2016-10-25 15:21:16 +02:00
Fox-McCloud
4b81269adc
reagents
2016-10-25 04:14:39 -04:00
Markolie
b3f505175e
Announcement refactor
2016-10-24 22:03:18 +02:00
Fox McCloud and GitHub
5fb35e7b23
Merge pull request #5809 from Markolie/idchecks
...
Fix up a number of ID checks
2016-10-24 15:52:01 -04:00
Markolie
88b2bf1a28
X-01 grammar fix
2016-10-24 16:43:30 +02:00
KasparoVy
82cf3fb93d
Fixes a bug where certain species could not select undergarments.
...
Their species names were just missing from the species_allowed
definitions.
2016-10-23 23:47:51 -04:00
KasparoVy
b8c6e5c6e5
Fixes 2 Bugs with PR #5416
...
First bug: Changing your alt head in CMA wouldn't update it correctly.
You had to proc update_body(1, 1) twice in order to do it because of
where the head_organ.handle_alt_icon() proc call was placed in
organ_icons. Resolved
Second bug: Lack of sanity and inability to select head marking styles
with "all" alt heads allowed. Resolved
2016-10-23 23:14:53 -04:00
Fox McCloud and GitHub
45ba4d157a
Merge pull request #5416 from KasparoVy/tail_markings_mark2
...
Marking Refactor, Adds tail markings + Alt heads + Secondary (F)Hair themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more...
2016-10-23 19:29:54 -04:00
Crazylemon64
698782d1ad
Puts the oxy KO threshold back to 50
2016-10-23 15:45:35 -07:00
Crazylemon64
be125358b3
Adds update_canmove to mob.Sleep()
2016-10-23 15:45:35 -07:00
Crazylemon64
7c8709b360
Brings over update_stat
2016-10-23 15:45:35 -07:00
Crazylemon64
8a6db8891f
Fox's requests
2016-10-23 15:45:35 -07:00
Crazylemon64
6a7f7394a8
Ports over the status effect unification
2016-10-23 15:45:35 -07:00
Fox McCloud and GitHub
da78a85781
Merge pull request #5804 from Markolie/morefixes
...
Pressure limit on disposal units
2016-10-23 17:22:48 -04:00
Fox McCloud and GitHub
656a04ce3e
Merge pull request #5805 from Scribblon/pAIAtmosFix
...
Fix for pAI Atmosphere Sensor
2016-10-23 17:22:05 -04:00
Fox McCloud and GitHub
c2b1de4499
Merge pull request #5807 from Markolie/sansfix
...
Fix Comic Sans HTML parsing
2016-10-23 17:21:20 -04:00
Markolie
79be3ca8cf
Fix up a number of ID checks
2016-10-23 15:49:02 +02:00
Markolie
199f6d91f1
Fix sans HTML parsing
2016-10-23 02:24:53 +02:00
Scriblon
db8d5ce158
Fix pAI Atmosphere Sensor
...
The problem was that in the old code, data["pressure"] was stored as a
String to round it. While NanoUI was programmed to use
helper.smoothRound() on that again which didn't like the String Object
pressure became.
As all data is integers and rouned in the UI, the fix chosen is to make
data["pressure"] a number again.
2016-10-22 21:05:40 +02:00
Markolie
9815f9e2c6
Pressure limit on disposal units
2016-10-22 20:51:49 +02:00
Fox McCloud and GitHub
f110b9e6a5
Merge pull request #5803 from Scribblon/ScrubberFix
...
Scrubbers now respect air alarm settings.
2016-10-22 11:58:01 -04:00
TheDZD and GitHub
062a14f2af
Merge pull request #5795 from Fox-McCloud/null-rod-cleanup
...
Nullrod istype Helpers
2016-10-22 09:35:16 -04:00
Scriblon
1f26c67031
Scrubbers now respect air alarm settings.
...
Scrubbers only worked when there was CO2, Toxins, or trace gasses in the
atmosphere, ignoring settings on the Air Alarm.
This commit fixes that and makes the scrubber respect the settings.
2016-10-22 15:25:44 +02:00
Markolie
3acde653d2
Fix cult girder layer
2016-10-21 18:04:00 +02:00
Markolie
4858136ca1
Cult wall fix
2016-10-21 17:59:47 +02:00
Markolie
010fa7d60f
Alien attack and organ fixes
2016-10-21 17:51:55 +02:00
Markolie
1a307cd8c9
Identity theft objective set fix, tank examine fix, proccall null return fix
2016-10-21 17:51:38 +02:00
Markolie