Tigercat2000
2c5201614e
Robustify Floortile launcher
...
Whoops, left it using /obj/item/stack/tile, which are debug items. Also,
spelling.
2015-11-11 18:07:25 -08:00
Tigercat2000
9186d94ba1
Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark
...
Conflicts:
icons/mob/suit.dmi
2015-11-11 16:51:44 -08:00
TheDZD
b72280c2e2
Merge pull request #2512 from Fox-McCloud/pneumatic-cannon
...
Ports TG Pneumatic Cannon
2015-11-11 09:52:16 -05:00
TheDZD
3f51bd5715
Merge pull request #2513 from Fox-McCloud/adminbus
...
Adminbus Items
2015-11-11 09:52:06 -05:00
Spacemanspark
df882e5d4b
Removes the toy chainsaw statement from human_defense.
2015-11-10 19:06:48 -06:00
TheDZD
0e94e359f1
Merge pull request #2506 from Fox-McCloud/kitchen-changes
...
Kitchen Updates
2015-11-10 19:35:29 -05:00
Fox McCloud
2e5224f0c9
Merge pull request #2510 from Tastyfish/master
...
Fixed problems with media machines (ie jukebox)
2015-11-10 19:26:06 -05:00
Spacemanspark
f8f8f95fbe
Prevents toy chainsaws from making dead people into meat.
2015-11-10 15:55:20 -06:00
Fox-McCloud
5f87575cf6
proper destroy
2015-11-10 04:25:57 -05:00
Fox-McCloud
c9da7b5d7c
Adminbus Items
2015-11-10 04:21:21 -05:00
Fox-McCloud
bfac0b62fa
Ports TG Pneumatic Cannon
2015-11-09 22:54:05 -05:00
TheDZD
53ec59a7fe
Merge pull request #2504 from Fox-McCloud/decloner-tweak
...
Decloner Tweak
2015-11-09 22:02:15 -05:00
Tastyfish
bc8627254c
Fixed Setting volume for media machines, as well as them updating for mobs in room
2015-11-09 21:57:24 -05:00
Fox McCloud
4325daaabc
Merge pull request #2497 from tigercat2000/html5_stuff
...
HTML5, IE11, CSS3
2015-11-09 20:59:14 -05:00
Fox-McCloud
ab3ed53734
Kitchen Updates
2015-11-09 01:09:59 -05:00
Fox-McCloud
43930aba4a
Decloner Tweak
2015-11-08 21:45:34 -05:00
Fox-McCloud
9237fdd1ab
Food Recipe Changes
2015-11-08 20:28:43 -05:00
Aurorablade
af9049f0fd
more spookyness
...
i am still doing something wrong as the ghost is not comming up in the
shot still..but closer
2015-11-08 15:19:47 -05:00
DZD
22c53438b9
Fixes broken hunter pounce caused by armor change.
2015-11-08 14:23:20 -05:00
Tigercat2000
29f42f8b61
Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/life.dm
code/modules/mob/living/silicon/pai/life.dm
2015-11-07 20:54:24 -08:00
Fox McCloud
cc6dcd72bb
Merge pull request #2468 from tigercat2000/tg-life
...
-tg- Life() refactors
2015-11-07 23:08:01 -05:00
Tigercat2000
e56f29ed88
Why do I sabotage myself? Standardizes virus2 creator, fixes wrong state.
2015-11-07 19:32:57 -08:00
TheDZD
ac68049fec
Merge pull request #2490 from Fox-McCloud/stripping
...
Adds Custom Strip Delays
2015-11-07 22:31:17 -05:00
Tigercat2000
77cdaedb42
Merge remote-tracking branch 'upstream/master' into html5_stuff
2015-11-07 19:20:45 -08:00
Fox McCloud
d7a06fc238
Merge pull request #2487 from TheDZD/ayyliens
...
Makes xenomorph stuns factor in melee armor
2015-11-07 22:19:33 -05:00
Fox McCloud
ed7de9ebec
Merge pull request #2483 from tigercat2000/virus2_is_a_little_less_trash
...
Admin Virus2 Creator
2015-11-07 22:19:14 -05:00
Tigercat2000
ee8ef3588f
not ideal but species deffault stuff yeah
2015-11-07 19:11:22 -08:00
Tigercat2000
9e69c55229
Fix occupations menu formatting
2015-11-07 09:47:52 -08:00
Tigercat2000
4e6397ffec
Fix Major UI updating issues, jQuery changes, debug hooks.
...
Also fixes incredibly fucked-up air alarm template and CSS.
2015-11-07 09:46:43 -08:00
Fox-McCloud
a32b31d9b4
Adds Custom Strip Delays
2015-11-06 22:34:55 -05:00
TheDZD
6deffa0535
Merge pull request #2489 from Fox-McCloud/circuit-board-pathing
...
Circuit Board Repathing and Swarmer Fixes
2015-11-06 21:51:39 -05:00
Fox McCloud
06862ceceb
Merge pull request #2475 from Crazylemon64/drone_trays
...
Adds a t-ray scanner to the drone's equipment set
2015-11-06 21:32:10 -05:00
Fox-McCloud
16a208f545
Circuit Board Repathing and Swarmer Fixes
2015-11-06 21:21:36 -05:00
TheDZD
9f6111d4f9
Merge pull request #2480 from Fox-McCloud/armor-fix
...
Armor Fix
2015-11-06 20:50:01 -05:00
DZD
66974661b8
Makes xenomorph stuns factor in the target's melee armor instead of always stunning for a full 5 seconds.
2015-11-06 20:44:24 -05:00
Fox McCloud
59cc99b0f5
Merge pull request #2484 from Tastyfish/master
...
Fixed Pun Pun's outfit getting equiped.
2015-11-06 19:01:10 -05:00
Tastyfish
fd2bfbacbe
fixed newline convention
2015-11-06 15:52:26 -05:00
Tastyfish
eb519c11d8
Fixed punpun not getting his suit equiped correctly, thus not getting his sprite updated.
2015-11-06 15:50:15 -05:00
Tigercat2000
d36352ae7c
HTML5 and CSS3 for NanoUI + Datum Browser
2015-11-06 11:27:32 -08:00
Aurorablade
51abacac93
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into TooSpoopy
2015-11-06 12:08:51 -05:00
Tigercat2000
2a8c16b7aa
Admin Virus2 Creator
...
Basic Nano-module virus2 creator
Not feature complete, but good enough for basic use
Current features:
- Make and delete virus datums
- Randomized symptoms/effects on creation
- Change effects for each stage
- Change multiplier and chance for each stage
- Spread to someone random or a specific chosen person (ignores bio
protection)
2015-11-06 07:57:32 -08:00
Fox-McCloud
fd0417f4cb
Armor Fix
2015-11-06 08:06:29 -05:00
TheDZD
c84fc71dc3
Merge pull request #2470 from Fox-McCloud/auto-correcting-hardsuits
...
Makes Hardsuits Auto-Adjust for Species
2015-11-06 06:38:55 -05:00
Fox-McCloud
2335c6be9d
Merge remote-tracking branch 'upstream/master' into barber-update
2015-11-06 06:30:59 -05:00
TheDZD
d504f33752
Merge pull request #2469 from Fox-McCloud/smoking
...
Adds Random Cigs
2015-11-06 06:15:01 -05:00
Fox-McCloud
5765744d15
Swarmer Event Hotfix
2015-11-05 20:38:17 -05:00
Fox-McCloud
1c8df180f8
Merge remote-tracking branch 'upstream/master' into barber-update
2015-11-05 19:42:41 -05:00
TheDZD
9d365d3f66
Merge pull request #2467 from Fox-McCloud/hammer-time
...
Various Fixes
2015-11-05 18:51:39 -05:00
Crazylemon
fdb32aa29f
Adds a t-ray scanner to the drone's equipment set
2015-11-05 12:27:31 -08:00
Fox-McCloud
17112cda3d
barber update 2.0
2015-11-05 06:51:00 -05:00
