Fox-McCloud
e4dd08c697
oops
2015-12-21 22:38:50 -05:00
Fox-McCloud
1796bcbc23
nukes jungle module
2015-12-21 22:32:54 -05:00
Fox-McCloud
2908021914
Removes Tribesman
2015-12-21 04:43:15 -05: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
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
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
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
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
Aurorablade
ccd6d2641b
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HudRefactor
2015-12-17 22:43:09 -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
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
Tigercat2000
91a9ab4683
Nuke the rest of bay shuttles. Fuck you, Bay shuttles.
2015-12-17 15:18:10 -08:00
Tigercat2000
7474cbcf48
Shuttles: Admin, Ferry, ERT + Science Fix
2015-12-17 14:21:42 -08:00
Tigercat2000
527475f886
Shuttles: NukeOps, Fixes
2015-12-17 11:41:55 -08:00
Tigercat2000
e014f4a1b6
Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT
2015-12-17 07:26:41 -08:00
KasparoVy
4453239421
Adds Vulpkanin Species Flag
...
Adds the Vulpkanin species flag to the cargo vendor, and fixes a couple
typos in the item descriptions.
2015-12-17 04:29:17 -05:00
Crazylemon64
d63f1607c3
No more surviving rayman reenactments
2015-12-17 00:42:23 -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
Fox-McCloud
a9a0a49986
Ports TG Beam Code and Medigun
2015-12-16 21:05:10 -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
Tigercat2000
e82eff800c
Shuttles: Research + Mining fixes
2015-12-15 18:19:34 -08: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
TheDZD
861bb11e93
Merge pull request #2823 from Fox-McCloud/aranesp
...
Aranesp Tweak
2015-12-14 19:10:57 -05:00
TheDZD
ff68ddbf55
Merge pull request #2822 from Fox-McCloud/fixup
...
Cell Weight Class and Tech Fixup
2015-12-14 19:10:41 -05:00
Tastyfish
2554939e38
fixed bee icon_states
2015-12-14 07:17:16 -05:00
Tastyfish
37ec30d75f
made video camera find telescreens via machines rather than world
2015-12-14 01:43:00 -05:00
Tigercat2000
a4ac9385ed
Emergency patch, fixes asset_cache interfering with verbs
2015-12-13 21:09:48 -08:00
Aurorablade
76eaf85c11
sec sunglasses fix
2015-12-13 23:43:01 -05:00
Tastyfish
f9a65b7532
added in world by tiger's request
2015-12-13 18:38:02 -05:00
Fox-McCloud
e15f65ce1f
CRY SUM MOAR
2015-12-13 18:10:32 -05:00
