ZomgPonies
3acff9ccff
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into russian
2015-12-20 06:29:28 -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
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
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
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
Aurorablade
95d8b50345
hud_updateflag purge!
...
EXTERMINATUS BITCH
2015-12-13 17:16:14 -05:00
Tigercat2000
544908c778
Shuttles: Vox Skipjack + Win button
2015-12-13 13:13:39 -08: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
Fox McCloud
ca768e5fa2
Merge pull request #2824 from tigercat2000/I_am_fucking_mental
...
/vg/ / -tg- asset_cache
2015-12-13 01:29:34 -05:00
Tigercat2000
3d71483372
/vg/ / -tg- asset_cache
...
Port of -tg-'s port of /vg/'s asset cache
Funny thing is, this actually replaces an old version of /vg/'s asset
cache we already had
IT'S A PORT OF A PORT REPLACING A PORT
POOOOOOOOOOOOOORTCEPTION
Basically, gets rid of the 30-40 second interface lag when you first join,
via *mumblemumble* MAGIC!
Also moves a few nano files around.
2015-12-12 21:25:04 -08:00
Fox-McCloud
309e325d3d
Aranesp Tweak
2015-12-12 23:39:42 -05:00
TheDZD
3986cbe698
Merge pull request #2813 from Fox-McCloud/antihol-fix
...
Reagent Fixes and Tweaks
2015-12-12 23:28:47 -05:00
Fox-McCloud
a2d10c4c49
Cell Weight Class and Tech Fixup
2015-12-12 22:40:02 -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
