Aurorablade
027d9660de
IT COMPILES
2015-12-24 20:26:46 -05:00
Aurorablade
1a70e9caf5
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2015-12-24 00:17:26 -05:00
Aurorablade
96c5a5c010
might as well fix fonglict
2015-12-23 22:18:11 -05:00
Aurorablade
046b0b997d
almost....
2015-12-23 11:40:16 -05:00
Fox McCloud
f6612ee40f
Merge pull request #2975 from Aurorablade/voxtest2
...
Voxtest2.ogg
2015-12-22 22:54:42 -05:00
TheDZD
335c9bc399
Merge pull request #2917 from Fox-McCloud/remove-tribesmen
...
Nukes Jungle Module
2015-12-22 22:19:38 -05:00
Aurorablade
b92e5a4ccb
fixes
2015-12-22 06:23:12 -05:00
Crazylemon64
72293bda07
Fixes that infinite table gripper bug
2015-12-21 23:31:09 -08:00
Crazylemon
132f149857
First test of a fix for the infinite tables bug
2015-12-21 22:14:56 -08:00
Aurorablade
4b7253befc
commit so i can swap branches...
...
please note, anything further on changling may invovle updates to game
mode, so another pr. and yes with the brains its jut blocked from
prepare_eat() proc
2015-12-21 23:19:27 -05:00
Fox-McCloud
1796bcbc23
nukes jungle module
2015-12-21 22:32:54 -05:00
Fox McCloud
0979afd8c5
Merge pull request #2910 from Crazylemon64/new_ipc_screens
...
Adds 4 new IPC screens: Scanline, RGB, Glider, and Console
2015-12-21 21:33:53 -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
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
Crazylemon
9d1dc3632b
Adds a "Glider" IPC screen
2015-12-20 17:29:43 -08:00
Crazylemon
2979a64c4d
Adds 3 new IPC screens: Scanline, RGB, and Console
2015-12-20 14:45:14 -08: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
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
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
