Fox-McCloud
4c2ecac801
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-26 07:42:05 -05:00
Fox McCloud
25dbef3e40
Merge pull request #6175 from Allfd/RigPort
...
Ports MarsM0nd's RIG suit fixes.
2017-01-26 07:33:15 -05:00
Fox-McCloud
4f72f89ad8
podmen fix
2017-01-23 08:05:55 -05:00
Fox-McCloud
5c828db250
fixes, comfrey, and aloe
2017-01-23 05:25:42 -05:00
Fox-McCloud
7007f6bbdf
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-23 01:01:09 -05:00
Fox-McCloud
ea76990b7a
Botany Rework
2017-01-21 18:28:03 -05:00
Crazy Lemon
37a7484976
Merge pull request #6149 from FlattestGuitar/log-upgrade
...
Adds log stacking to admin logs
2017-01-18 19:13:50 -08:00
Mieszko Jędrzejczak
1b506aaf9f
Switches over to the new system
2017-01-17 13:57:07 +01:00
Alffd
ed727b4a7c
Ports MarsM0nd's RIG suit fixes.
...
Ports MarsM0nd's RIG suit fixes.
2017-01-14 17:06:44 -05:00
Crazylemon64
bfdd22dcd9
Fixes a few limb removal runtimes
2017-01-10 18:59:33 -08:00
Crazy Lemon
f1c3a7cd13
Merge pull request #6085 from Fox-McCloud/food-rework
...
Food rework
2017-01-10 12:11:17 -08:00
Fox McCloud
5a01a6c7d3
Merge pull request #5840 from Crazylemon64/adds_reset_perspective
...
Polishes up `reset_view`
2016-12-23 07:27:36 -05:00
Crazylemon64
339a187f9f
Fixes vision updates such as implants and similar
2016-12-21 17:59:08 -08:00
Crazylemon64
6d3e66f41c
Polishes up the reset_view proc, which is basically
...
`reset_perspective` from tgstation.
Also adds various support for remote viewing lenses - like cameras not
transmitting xray vision, among other things
Recommit because we're using different compiler versions
2016-12-21 17:56:57 -08:00
Tigercat2000
27278ca2b1
Fix xenomorph organ surgery (properly)
2016-12-21 07:16:13 -08:00
Fox-McCloud
e134100164
Hunger Rework
2016-11-28 13:17:46 -05:00
Crazy Lemon
405fe1bb54
Merge pull request #5842 from Fox-McCloud/reagent-reorganization
...
Reagent Reorganization
2016-11-21 16:54:41 -08:00
TheDZD
220ed7b27b
Merge pull request #5872 from Fox-McCloud/bsa
...
BSA Tweaks
2016-11-13 20:27:27 -05:00
Fox-McCloud
fcc20ac6bc
BSA Tweaks
2016-11-09 22:36:03 -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
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
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
6a7f7394a8
Ports over the status effect unification
2016-10-23 15:45:35 -07:00
Codingale
79b527d82b
Modify to implied src
...
Corrected typo in comment. Modified not to use src.
2016-09-24 08:55:33 -04:00
Codingale
f231f8f27a
Update blood.dm
...
Conform to agreed upon standards.
2016-09-23 17:10:42 -04:00
Codingale
4beac970c6
Fixes #5673
2016-09-23 16:49:20 -04:00
KasparoVy
1373070b98
More Conflict Resolution
2016-09-03 21:29:10 -04:00
Krausus
cd4cb5df0a
Fixes wound cleanup timer runtime
2016-08-30 01:23:37 -04:00
TheDZD
f5577b4a8f
add_logs() un-fuckery
2016-08-29 17:27:56 -04:00
KasparoVy
1c407a36a1
Sorts out some runtimes, adds randomization for a bunch more stuff in character preferences, adds species validation to undergarments, adds absolute pathing to sprite_accessories and repaths alot of stuff.
...
Also corrects some oversights.
2016-08-27 09:22:01 -04:00
Fox McCloud
4f590f27c4
Merge pull request #5537 from Crazylemon64/debug_log_to_error_viewing
...
Moves from `log_debug` to `log_runtime` for non-fatal abberant states
2016-08-26 21:15:31 -04:00
KasparoVy
cd9b12086b
Merge remote-tracking branch 'upstream/master' into repathing-sprite-accessories
2016-08-26 02:28:47 -04:00
Fox McCloud
8cd9e4864b
Merge pull request #5522 from Crazylemon64/airlock_wire_runtime_fix
...
Fixes a runtime when an airlock set to `autoclose` is deleted
2016-08-25 22:55:59 -04:00
Crazylemon64
16dd4e9d21
Moves many uses of log_to_dd to log_runtime, to make the output
...
more visible at runtime, to someone who isn't watching DD first-hand
2016-08-24 09:55:19 -07:00
Crazylemon64
b633cf53af
Moves from log_debug to log_runtime for non-fatal abberant states
2016-08-23 17:03:52 -07:00
KasparoVy
e0bad95adc
Adds Some Markings and a Vulp F.Hair Style, Fixes Preferences Marking Randomization, Fixes Species-change thru CMA Bug, Fixes Vulp Kita F.Hair Style Colouring, Fixes Fatness and Deformation.
...
Previously, your markings would only randomize if you clicked the randomize button and were of a species that had body markings. Fixes that and tidies up the proc calls for marking randomization a bit.
Furthermore, a bug existed where if you changed a mob's species via CMA, the mob's cosmetic attributes (hair, hair colour, skin colour, skin tone, marking styles and colours, head accessory style and colour) will not have changed correctly. Delaying appearance update fixed that.
Finally, a mob's body will now correctly render as fat if they become fat and skinny if they become skinny and show deformities immediately.
Further explaining this fix: It required an override to be implemented in update_body that re-cached the mob's bodyparts in order to reflect changes to the limbs (i.e. fatness/slimness).
As for deformation, I just needed to modify the existing update_body() proc call.
2016-08-23 09:06:03 -04:00
Crazylemon64
7a75910bb0
Peoples' limbs are no longer given a wound cleanup timer if they don't
...
need it
2016-08-23 02:50:51 -07:00
Crazylemon64
38adc54c77
Humans no longer spew debug messages when deleted
2016-08-22 23:40:57 -07:00
TheDZD
96f07927e9
Merge pull request #5512 from Crazylemon64/dont_worry_bones_grow_back
...
You can now cancel surgery after cutting someone's ribcage open again
2016-08-22 19:33:11 -04:00
Crazylemon64
4326b9383e
Abductor surgery, Face repair, now all work again
2016-08-22 11:42:01 -07:00
Crazylemon64
80055208ec
Forgot about this one, too
2016-08-21 13:26:31 -07:00
Crazylemon64
04dfa164b4
Don't worry, bones grow back (You can now mend incisions after
...
having cut someone's ribcage open, at Fox's request)
2016-08-21 13:13:56 -07:00
KasparoVy
ab3f71b359
Conflict resolution again
2016-08-19 01:08:08 -04:00
Fox McCloud
08800863ad
Merge pull request #5495 from Crazylemon64/organ_fixes_v2
...
Fixes a bunch of organ-related bugs
2016-08-18 23:49:52 -04:00
Crazylemon64
6aedd26beb
Fixes a bunch of organ-related bugs
2016-08-18 19:08:29 -07:00
KasparoVy
29a90bff9f
Conflict resolution.
2016-08-18 03:28:03 -04:00
Crazylemon64
d3d44529c6
Naked fat people are fat.
2016-08-17 20:48:57 -07:00
TheDZD
db3a13a1d1
Merge pull request #5453 from Crazylemon64/ipc_surgery_fix
...
Makes IPC surgery much more reliable.
2016-08-17 20:15:53 -04:00
