Fox McCloud
4e2087fc1f
Merge pull request #2885 from Crazylemon64/blood-n-guts
...
Organ Germiness Adjustments
2015-12-20 22:18:31 -05:00
Crazylemon
f908f12f5b
Adds a dna adder to head code so that head removal doesn't runtime ever
2015-12-20 18:46:47 -08:00
Crazylemon
3f3886fcfb
Heads will now keep their appearance and name even if grafted
...
This doesn't fiddle with actual identity though
2015-12-20 18:35:59 -08:00
Crazylemon
2667385040
Removes some extra color macros
2015-12-20 18:34:41 -08:00
TheDZD
1ddab7f612
Merge pull request #2867 from Crazylemon64/ipc_brain_fix
...
IPC multibrain fix
2015-12-20 21:31:49 -05:00
Fox McCloud
c4c7a51234
Merge pull request #2904 from Aurorablade/LINGLINGLINGWENTTHECRYBORG
...
Hud Fixups
2015-12-20 21:12:26 -05:00
Aurorablade
6bde6078e2
don't code half awake
...
also added some hud making stuff to the make antag procs. it might fix
an issue fox reported..more sleep now
2015-12-20 07:16:35 -05:00
Crazylemon
43dcb6d043
Death to my nasty odysseus mechud snowflake!
2015-12-20 01:46:36 -08:00
Aurorablade
d75549fdd6
no more changling cyborgs
...
also added in some procs for as furture need...god i need sleep now.
2015-12-20 01:47:15 -05:00
TheDZD
ff32b32eb9
Merge pull request #2894 from Fox-McCloud/wormhole-projector
...
Ports Wormhole Projector
2015-12-20 00:34:44 -05:00
Fox McCloud
88ca79a37b
Merge pull request #2902 from TheDZD/putting-this-cryo-bug-on-ice
...
Fixes Cryopods Being Overly Attached to Crew
2015-12-19 22:58:41 -05:00
TheDZD
f7937b5df1
This is why we can't have ice things
2015-12-19 22:17:30 -05:00
Fox-McCloud
8bfa404d9d
auto-switching
2015-12-19 21:55:41 -05:00
Fox McCloud
6d1b361c7d
Merge pull request #2888 from TheDZD/fluff
...
Donator Fluff Items: Tactics Edition
2015-12-19 20:35:15 -05:00
TheDZD
56f01cf7ba
Merge pull request #2901 from Fox-McCloud/spec-ops-shuttle
...
Fixes Spec Ops Shuttle
2015-12-19 20:34:53 -05:00
Fox McCloud
6ab80ba63e
Merge pull request #2900 from TheDZD/quickfixplsmerge
...
Fixes Shuttle Transit Z-Levels
2015-12-19 20:30:58 -05:00
Fox-McCloud
4bbb17869c
Fixes Spec Ops Shuttle
2015-12-19 20:28:30 -05:00
TheDZD
8436047fe9
Fixes Shuttle Transit Z-Levels
...
Fixes z level fuckery with jumping off of shuttles in transit.
Fixes #2518
2015-12-19 20:26:33 -05:00
Fox-McCloud
ea11eaa387
Ports Wormhole Projector
2015-12-19 00:57:40 -05:00
Fox McCloud
4c03cf2599
Merge pull request #2797 from Aurorablade/HudRefactor
...
[Ready for Review][WTF]Hud refactor
2015-12-18 21:13:21 -05:00
TheDZD
2dfd21bec9
Merge pull request #2887 from Fox-McCloud/cargo-shuttle-fix
...
Cargo Shuttle Fix
2015-12-18 18:48:49 -05:00
Crazy Lemon
91b091358e
Fixes a derp I made
2015-12-18 14:18:43 -08:00
Crazylemon64
2fc7a199a8
While I'm at it, give medical more starting antibiotics
2015-12-18 08:10:10 -08:00
Crazylemon64
1d19ddf6db
Spaceacillin has now taken its wheaties
...
A chem that you need loads of to be useful being necessary to save
patients from not being tended to in a bit? Nah, supermedicine gogogo
2015-12-18 08:03:41 -08:00
Fox-McCloud
c9d96416fc
Fixes emergency shuttle access
2015-12-18 11:01:51 -05:00
Fox-McCloud
459cf6dfee
Cargo Shuttle Fix
2015-12-18 09:43:56 -05:00
Crazylemon64
ee036825ce
Some MMI adjustments put in a separate commit
...
These don't seem to work 100% nice, trying to view the held_brain of the
MMI with VV causes me to temporarily lose connection. Some advice would be
appreciated.
2015-12-18 05:02:45 -08:00
Crazylemon64
fe606492a0
Organs are now easier to keep clean for surgery
...
* They initially rot slower, and won't rot if on the same tile as a freezer
* Having dirty hands when doing internal organ surgery will now contaminate
the internal organs. Wash those hands!
2015-12-18 04:51:04 -08:00
Fox McCloud
df3259446d
Merge pull request #2884 from Fox-McCloud/shuttle-fixes
...
Shuttle Access Fixes
2015-12-18 07:16:14 -05:00
Fox-McCloud
4457a08b16
Shuttle Access Fixes
2015-12-18 07:12:19 -05:00
Aurorablade
3b603dcade
please work?
2015-12-18 06:30:22 -05:00
Fox McCloud
b91e95120f
Merge pull request #2869 from KasparoVy/master
...
Adds Vulpkanin Species Flag
2015-12-18 04:57:24 -05:00
Aurorablade
3ae8118b9c
please let me have map merged right....
2015-12-18 03:09:25 -05:00
Crazylemon64
860275f51d
Splits the primary organ checking into another function
...
Also fixes the head and brain renaming so it works off of DNA instead of
the body you took it of
2015-12-17 22:42:28 -08:00
Fox McCloud
7bacf21adc
Merge pull request #2877 from orelbon/APC
...
APC Fix
2015-12-18 00:49:10 -05:00
orelbon
9d78a11473
APC Fix
...
Probably fixes #2858
Removed APC east next to bridge.
2015-12-17 23:46:37 -05:00
TheDZD
f12675b248
Merge pull request #2866 from Fox-McCloud/rapid-construction
...
Ports Rapid Construction for Part Replacer
2015-12-17 23:35:26 -05:00
Aurorablade
ccd6d2641b
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HudRefactor
2015-12-17 22:43:09 -05:00
Fox McCloud
26c08905a0
Merge pull request #2719 from tigercat2000/I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT
...
-tg- shuttle system
2015-12-17 21:50:17 -05:00
Tigercat2000
12911463e7
Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT
...
Conflicts:
code/game/gamemodes/objective.dm
2015-12-17 18:46:50 -08:00
Tigercat2000
1ff3d20075
Last fixes
2015-12-17 18:38:13 -08:00
TheDZD
8e9cfff75a
Merge pull request #2864 from Fox-McCloud/medigun
...
Ports TG Beam Code and Medigun
2015-12-17 21:19:13 -05:00
TheDZD
95092816d1
Merge pull request #2868 from Fox-McCloud/hijack-fix
...
Fixes Hijack Objective
2015-12-17 21:12:56 -05:00
TheDZD
4a1f712722
Merge pull request #2859 from Fox-McCloud/meteor
...
Adjusts Meteor Required Players
2015-12-17 21:12:50 -05:00
Crazylemon
855b110433
Organs are now preserved more reliably; First pass
2015-12-17 17:16:55 -08:00
Fox-McCloud
3db762597c
actual fix
2015-12-17 20:00:29 -05:00
Tigercat2000
b085bf8bab
Shuttle README, Wrap up dev tools.
2015-12-17 16:49:19 -08:00
TheDZD
1fe27d3cde
Donator Fluff Items: Tactics Edition
...
- Lunch pail (contains a soda, chips, and a sandwich)
- Tactical suit and tactical balaclava (both cosmetic only, the former is a jumpsuit)
- Combat pants and tactical armor vest (reskinned sec armor vest, for sec officer role only) NOTE: The pants have an on-mob worn icon, but not a general icon, currently uses chaps sprite as a placeholder.
- Dog whistle, summons a dog with a NODROP detective hat (yes, it's permanently glued to his head) because bluespace.
2015-12-17 19:12:23 -05:00
Aurorablade
f077de54ae
sneaky sneaky guardian fix.
2015-12-17 18:55:39 -05:00
Fox-McCloud
fe3d1b7360
balance
2015-12-17 18:24:03 -05:00
Fox McCloud