Commit Graph

6203 Commits

Author SHA1 Message Date
Jordie
a09d69e985 Merge pull request #12330 from feemjmeem/tanksuicide-refactor
re-enable tank suicide, but retain body and all objects
2015-10-29 14:27:37 +11:00
Cheridan
62527884ed Merge pull request #12702 from optimumtact/pkpenguin
Adds a surgery to attach a chainsaw to your hand
2015-10-28 18:08:36 -05:00
Cheridan
f00b6101e7 Merge pull request #12698 from Firecage/youcandoitlilmonkey
Allows monkeys to use ointments and brute packs.
2015-10-28 17:51:56 -05:00
Cheridan
89f8b0eea5 Merge pull request #12697 from KorPhaeron/biobag
Moves biobags under biosuits
2015-10-28 16:37:19 -05:00
Razharas
a59d4c47f0 Merge pull request #12234 from Incoming5643/flapping_intensifies
Modifies plastic flaps to defeat the secret box technique.
2015-10-28 19:39:45 +03:00
Razharas
980b3ec4a3 Merge pull request #12071 from KorPhaeron/captainqol
Small tweaks to captains starting equipment
2015-10-28 19:36:09 +03:00
Razharas
6d89f6cd69 Merge pull request #12687 from tkdrg/uncreative_branch_name
Fixes chainsaws losing force when dropped
2015-10-28 19:30:22 +03:00
Razharas
9357602233 Merge pull request #12665 from tkdrg/ghost_medsechuds
[READY] Adds a ghost on-screen HUD
2015-10-28 05:19:19 +03:00
Tkdrg
dd20530f0e Adds ghost alerts.
Adds ghost alerts for revival (cloning, MMIs, nar-sie, drones, etc).
2015-10-27 23:07:41 -03:00
PKPenguin321
fe8d0e58cd Adds a surgery to attach a chainsaw to your hand
Once added you cannot remove the chainsaw and the hand will be forever
used
2015-10-28 12:16:58 +13:00
Firecage
69ed8e756d Allows monkeys to use ointments and brute packs. 2015-10-28 00:10:11 +02:00
KorPhaeron
fe6adf6cc1 Biobag 2015-10-27 16:13:43 -05:00
Cheridan
fe41766141 Merge pull request #12658 from francinum/patch-7
chainsaw is too cumbersome to carry in one hand!
2015-10-27 11:12:08 -05:00
Razharas
ba1b70106d Merge pull request #12497 from bgobandit/ayyyfixes
Even more xenobiology fixes and tweaks
2015-10-27 18:28:48 +03:00
Tkdrg
2b1a1f42fd Fixes chainsaws losing force when dropped
Fixes #12683
2015-10-27 11:36:55 -03:00
francinum
86f5a28e73 Update twohanded.dm 2015-10-26 13:27:24 -04:00
francinum
faeabc713f Makes Twohand Required pickup use wield()
Fucking Ergo.
2015-10-26 13:18:11 -04:00
francinum
659823392f You drop The Murderfucker.
the to \the
2015-10-26 12:51:28 -04:00
francinum
571627b501 Goddamnit. 2015-10-25 22:41:11 -04:00
francinum
0f3a6d11c3 You drop the chainsaw. 2015-10-25 22:40:02 -04:00
francinum
44f3e23bf0 chainsaw is too cumbersome to carry in one hand! 2015-10-25 22:01:30 -04:00
Cheridan
ed9b0c35c6 Merge pull request #12612 from phil235/BugFixBoogalooI
bugfixes: bloodcrawl, losebreath, wintercoat, and more
2015-10-25 14:19:11 -05:00
Cheridan
a53d35e00c Merge pull request #12548 from tkdrg/ilive_again
Adds Chainsaws
2015-10-25 13:09:55 -05:00
Cheridan
b10368c3e3 Merge pull request #12306 from Incoming5643/RTD
Adds d1 and d100 dice
2015-10-25 05:19:17 -05:00
Incoming5643
c4af09089c no comment 2015-10-24 23:44:22 -04:00
Incoming
5b3215a6d7 @memo incoming wow making sure you update to master sure is hard huh? 2015-10-24 23:43:26 -04:00
Incoming
ddbfec6fbc Merge branch 'master' of https://github.com/tgstation/-tg-station into flapping_intensifies
Conflicts:
	code/game/machinery/computer/shuttle.dm
2015-10-24 23:32:55 -04:00
phil235
da84fcd8d2 - Fixes shadowling receiving burn messages even when dead. I've also fixed the same bug for other species and made certain spec_life() procs not run when the mob is dead. I also made slime species a subtype of jelly species since they had a lot of code in common thus reducing duplicate code.
- Fixes odd behavior with emagging airlock and windoor animation.
- Fixes being able to bloodcrawl in oil decal.
- Fixes being deaf after bloodcrawling.
- Fixes wintercoat hood appearing below the mask.
- Fixes being able to attack another mob before the game has started (and other things which used a gamestart check that no longer works).
- Ghosts can no longer become drones before the game has started.
- Removed "bhunger" and "ajourn" mob vars, they are unused.
- Fixes admin-revived morph being invisible.
- Fixes heart attack stacking losebreath very high. Also now losebreath is reset to 0 when the mob dies.
- All mobs no longer have a default strip menu showing two hands.
2015-10-23 20:00:52 +02:00
Nerd Lord
d05c81c2d9 This should resolve conflicts and not fail to compile woo woo 2015-10-22 22:10:29 -04:00
Cheridan
6bfa738a24 Merge pull request #12567 from phil235/EffectSystemTweak
Makes effect system code more OOP.
2015-10-22 21:00:10 -05:00
phil235
be4b3a6857 Merge pull request #12478 from Firecage/Mirrorfixing
Adds fixing mirrors.
2015-10-22 19:16:55 +02:00
Firecage
40b149ade7 Removes one indent from the return. 2015-10-22 19:11:23 +02:00
phil235
c7670dc627 Merge pull request #12558 from Bawhoppen/medbaysigntypo1
Fixes medbay sign description typo
2015-10-22 12:41:26 +02:00
Razharas
e1bad58c4a Merge pull request #12503 from Robustin/master
Pneumatic Nerf
2015-10-22 09:33:02 +03:00
Cheridan
ecdaeaad4c Merge pull request #12540 from Incoming5643/this_blows
Syndicate bomb payloads will now detonate if set on fire
2015-10-21 19:11:05 -05:00
phil235
fb7ad8b38f Merge pull request #12452 from Xhuis/radical
Radiation tweaks and a geiger counter
2015-10-22 01:13:00 +02:00
Tkdrg
0458f939b4 Adds Chainsaws
Happy Halloween!

Sprites by WalterJe.

These are force 21 two-handed weapons. They are sharp and can be
tablecrafted by spending one circular saw, one plasteel sheet, and one cable
coil, plus a welding tool for crafting. The sound used is from the
freesounds.org and was released into the public domain. It is available
at https://www.freesound.org/people/esperri/sounds/118972/.

This is a rehash of PR #6320 if you're feeling dejavu.
2015-10-21 20:11:29 -03:00
phil235
4d3449dc63 Merge pull request #12513 from bgobandit/iamaclown
Fixes bio-bags not showing up where they're supposed to.
2015-10-22 00:47:56 +02:00
phil235
261ee72cce Merge pull request #12511 from KorPhaeron/icon
Fixes icon not updating when you craft an explosive lance
2015-10-22 00:47:31 +02:00
phil235
8751f9afb5 derp 2015-10-21 23:48:23 +02:00
phil235
d3ee910211 Makes effect system code more OOP.
obj/effect/effect is now renamed obj/effect/particle_effect for better usability.
datum/effect/system and /datum/effect/effect/system are now both /datum/effect_system.
Fixes a bug where wall mounted igniters (and other spark producing objects) didn't produce sparks sometimes.
Moved explosion_particles.dm into the effect_system folder, because it has effect_systems code.
2015-10-21 23:28:29 +02:00
Nerd Lord
c21fd722e9 Defile now rusts normal and rwalls at a very low chance.
Revenant abilities cause purple sparkles now.
Incidentally fixed up EMP pulses so they don't set the name and duration of the object they spawn for everything that spawns the object.
2015-10-21 14:05:59 -04:00
Lularian
40c9527211 Annoying desc for medbay sign 2015-10-21 09:31:39 -05:00
Cheridan
b31f114940 Merge pull request #12510 from Core0verload/tankytanksoftank
Buffs big air/oxy tanks damage to 10
2015-10-20 17:47:30 -05:00
Incoming
1db3c0c18b Syndicate bomb payloads will now detonate if set on fire long enough. Note that the casings for the bombs is fireproof, so if you want to set fire to a bombcore you'll need to remove it from the case first.
Fixes #12468 while I'm here to avoid another box pull
2015-10-20 15:52:38 -04:00
Cheridan
bb544c6c92 Merge pull request #12494 from Anonus/timestop
Fixes untoggled switchblade force
2015-10-19 20:54:47 -05:00
bgobandit
b554319d6a biobag hotfix 2015-10-19 18:02:57 -04:00
Razharas
d1df0bfeff Merge pull request #12485 from xxalpha/ultrarange
Added ultra_range() proc.
2015-10-20 00:17:09 +03:00
KorPhaeron
8a3ce07b25 update icon 2015-10-19 15:40:33 -05:00
Razharas
f8056d6d86 Merge pull request #12389 from KorPhaeron/MEDIOCRE
Makeshift explosive lances
2015-10-19 22:58:50 +03:00