Commit Graph

6813 Commits

Author SHA1 Message Date
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
Aurorablade
80eb828563 this shit dosen't even compile yet... 2015-12-19 22:39:47 -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
KasparoVy
9feda771fd Woops. Draws from appropriate tail sprites. 2015-12-19 00:10:05 -05:00
KasparoVy
3d86eddcd4 Adds Alternate Unathi Tails to Body_Accessories 2015-12-18 23:28:34 -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
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
Aurorablade
ccd6d2641b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HudRefactor 2015-12-17 22:43:09 -05: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
Tigercat2000
e014f4a1b6 Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT 2015-12-17 07:26:41 -08:00
Crazy Lemon
8deec9b0a4 Update life.dm 2015-12-17 00:07:58 -08:00
Crazylemon64
26545e6ba1 Fixed up organ surgery so it'd reflect organs properly
This will work in spite of the states, so that sticking a human head on an
IPC will still let you remove the brain from that useless head, without
giving the brain any silly names
2015-12-16 23:01:28 -08:00
Aurorablade
52e43c4d2d good news everyone! It works! 2015-12-17 01:29:21 -05:00
Crazylemon
9fa9f40214 First test of preventing multibrain shenanigans 2015-12-16 17:53:37 -08:00
TheDZD
0b3e8f6645 Merge pull request #2846 from Fox-McCloud/legssss
Rebalances Leg Loss
2015-12-16 20:10:43 -05:00
TheDZD
d0600a6fce Merge pull request #2844 from Fox-McCloud/gib-fix
Gib Fix
2015-12-16 20:10:36 -05:00
Aurorablade
6eac1092bb hate the mask of narnar 2015-12-15 22:27:30 -05:00
Aurorablade
c3f662a6dc zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz 2015-12-15 03:08:16 -05:00
Fox-McCloud
14bb681b8d Rebalances Leg Loss 2015-12-15 01:27:19 -05:00
Fox-McCloud
85d77b391a Gib Fix 2015-12-14 21:13:55 -05:00
Fox McCloud
3d04e396ed Merge pull request #2825 from Tastyfish/coughsplosion
Added voice analyzer & Entertainment monitor supporting audible emotes
2015-12-14 20:47:33 -05:00
Tastyfish
2554939e38 fixed bee icon_states 2015-12-14 07:17:16 -05:00
Aurorablade
76eaf85c11 sec sunglasses fix 2015-12-13 23:43:01 -05:00
Aurorablade
95d8b50345 hud_updateflag purge!
EXTERMINATUS BITCH
2015-12-13 17:16:14 -05:00
Tigercat2000
0e3c1f7fc6 Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT 2015-12-13 09:25:04 -08:00
Tastyfish
f39649be57 added hear_message, like hear_talk but for audible emotes, voice analyzer & newscaster support 2015-12-13 04:36:41 -05:00
TheDZD
a0d2942433 Merge pull request #2821 from Fox-McCloud/spacepod-fix
Spacepods Whyyyy
2015-12-12 19:11:53 -05:00
Aurorablade
424837ecad Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HudRefactor 2015-12-12 19:06:04 -05:00
Aurorablade
aca9d31853 almossstttttt 2015-12-12 18:45:07 -05:00
Fox-McCloud
a7fc7f1176 Spacepods Whyyyy 2015-12-12 18:37:40 -05:00
Tigercat2000
0fa321a6f9 Misc. Fixes, shuttle_caller_list, autoCall 2015-12-12 07:33:10 -08:00
Aurorablade
374867baf7 Now channeling beepsky 2015-12-11 14:57:41 -05:00
Aurorablade
323a7e84cc woops... 2015-12-10 22:31:50 -05:00
Fox-McCloud
068bfd10ba TG Mining Update 2015-12-10 21:35:02 -05:00
Aurorablade
b88ddf0257 Diagnostic hud, file i miseed to make
and stuff updates right health wise.
2015-12-10 20:05:54 -05:00
Aurorablade
670a2a9e33 Icon names 2015-12-10 07:23:40 -05:00
Aurorablade
950ae86a92 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HudRefactor 2015-12-10 06:47:43 -05:00
Aurorablade
972177d1e9 its working..kinda 2015-12-10 06:45:19 -05:00
Aurorablade
c590958f2d Hud refactor 2015-12-10 01:01:54 -05:00
Fox McCloud
8502134e9a Merge pull request #2785 from scrubmcnoob/patch-1
Maintenance Drone Vent Crawling
2015-12-09 20:07:42 -05:00
Fox McCloud
f6e7d30805 Merge pull request #2784 from Crazylemon64/robo_flash_and_console_tracking
Roboconsole gives loc and health, Drones now flash right
2015-12-09 17:45:58 -05:00
TheDZD
4fe7f81e97 Revert "Reverts #2687" 2015-12-09 17:25:10 -05:00
Tigercat2000
42aa800393 Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT
Conflicts:
	code/game/supplyshuttle.dm
	code/modules/mining/laborcamp/laborshuttle.dm
2015-12-09 10:08:28 -08:00
Crazylemon
67366fb5d1 Fixes a bitflag check to work right.
This will probably let you have your hair in character setup again
Haven't tested it though, no time yet
2015-12-08 22:01:51 -08:00
TheDZD
a541d11913 Merge pull request #2448 from tigercat2000/footsteps_are_good_iunno
Footstep sounds
2015-12-08 20:37:49 -05:00
scrubmcnoob
2cb73bf143 Maintenance Drone Vent Crawling
Allows Maintenance Drones to vent crawl around the station. 
Made a suggestion on the forums a while back and everyone was fine with it, it was a matter of finding some one to do it.
I finally went through the code and found the correct code for this change.
2015-12-08 20:04:48 -05:00
Crazylemon64
289d54661c Roboconsole gives loc and health, Drones now flash right
- Adds health and location readings to the robot control console

- Drones now update status effects, so that flashes don't last forever
2015-12-08 14:29:56 -08:00
TheDZD
2c4549d7ac Revert "Make color dialogs appear with current color."
This reverts commit af94d1bf6f.
2015-12-07 21:25:42 -05:00