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
Aurorablade
23e392f0ef
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-10-31 22:38:14 -04:00
Markolie
6acfd29bd5
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into cameraconsoleupdate
2016-10-31 14:49:20 +01:00
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
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
Aurorablade
1a6803c7bb
Comments done mostly...Slughter demon whispers runtimes.
2016-10-27 20:44:54 -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
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
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
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
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
Aurorablade
f587cadb0f
blurgh
2016-10-24 22:34:02 -04:00
Aurorablade
0a265f963c
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-10-24 22:30:16 -04:00
Aurorablade
306520660d
something something merge conflicts
2016-10-24 22:30:02 -04:00
Fox McCloud
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
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
da78a85781
Merge pull request #5804 from Markolie/morefixes
...
Pressure limit on disposal units
2016-10-23 17:22:48 -04:00
