f618a4690b
Merge pull request #12752 from KorPhaeron/xenobiology2
...
Xenobiology Control Console
2015-11-01 18:30:34 +03:00
8b22368202
Merge pull request #12678 from MMMiracles/asmartidea
...
Esword Embedding
2015-11-01 16:17:01 +03:00
5a781f93df
Merge remote-tracking branch 'refs/remotes/tgstation/master' into xenobiology2
2015-10-31 21:47:10 -05:00
74f00a016d
Merge branch 'master' of https://github.com/tgstation/-tg-station into supermatter_sword
...
Conflicts:
icons/mob/inhands/items_lefthand.dmi
icons/mob/inhands/items_righthand.dmi
icons/obj/weapons.dmi
2015-10-31 19:56:13 -04:00
a9138e84c1
*Adds supermatter sword sprites
...
*Makes bullets that hit the supermatter sword get eaten
*Fixes some edge cases where a sword could eat itself
*Improves atmos handling
2015-10-31 19:48:24 -04:00
9ee8d1c256
Merge pull request #12589 from Cheridan/5e
...
Upgrades Paladin to Fifth Edition
2015-11-01 02:09:01 +03:00
590644c06e
Merge pull request #12686 from Firecage/jetpackobjective
...
Changes jetpack objective
2015-10-31 21:42:07 +03:00
d87803fdb4
Slime blueprints
2015-10-30 04:42:20 -05:00
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
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
f00b6101e7
Merge pull request #12698 from Firecage/youcandoitlilmonkey
...
Allows monkeys to use ointments and brute packs.
2015-10-28 17:51:56 -05:00
6d89f6cd69
Merge pull request #12687 from tkdrg/uncreative_branch_name
...
Fixes chainsaws losing force when dropped
2015-10-28 19:30:22 +03:00
9357602233
Merge pull request #12665 from tkdrg/ghost_medsechuds
...
[READY] Adds a ghost on-screen HUD
2015-10-28 05:19:19 +03:00
dd20530f0e
Adds ghost alerts.
...
Adds ghost alerts for revival (cloning, MMIs, nar-sie, drones, etc).
2015-10-27 23:07:41 -03:00
KiwiFarms
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
69ed8e756d
Allows monkeys to use ointments and brute packs.
2015-10-28 00:10:11 +02:00
2bcc3aeb9e
Embed chance of 75% because having less than 1/2 of a chance of your magic death stick being tossed into your enemy's hand could only go right.
...
Also changelog.
2015-10-27 16:06:02 -04:00
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
d040083bf5
Adds the captains jetpack, both as an item and the new objective.
2015-10-27 17:34:27 +02:00
ba1b70106d
Merge pull request #12497 from bgobandit/ayyyfixes
...
Even more xenobiology fixes and tweaks
2015-10-27 18:28:48 +03:00
2b1a1f42fd
Fixes chainsaws losing force when dropped
...
Fixes #12683
2015-10-27 11:36:55 -03:00
37ea3902e1
Allows eswords to embed if thrown. If you're crazy enough to throw your death stick at the guy you're trying to kill you should be rewarded for actually hitting.
2015-10-26 23:56:16 -04:00
86f5a28e73
Update twohanded.dm
2015-10-26 13:27:24 -04:00
faeabc713f
Makes Twohand Required pickup use wield()
...
Fucking Ergo.
2015-10-26 13:18:11 -04:00
659823392f
You drop The Murderfucker.
...
the to \the
2015-10-26 12:51:28 -04:00
571627b501
Goddamnit.
2015-10-25 22:41:11 -04:00
0f3a6d11c3
You drop the chainsaw.
2015-10-25 22:40:02 -04:00
5a4d72f5a4
*Supermatter sword will now passively eat through anything you put it in, and burn through the floor it's resting on!
...
*Supermatter sword now laughs at explosions and acid!
2015-10-25 22:08:22 -04:00
44f3e23bf0
chainsaw is too cumbersome to carry in one hand!
2015-10-25 22:01:30 -04:00
a53d35e00c
Merge pull request #12548 from tkdrg/ilive_again
...
Adds Chainsaws
2015-10-25 13:09:55 -05:00
b10368c3e3
Merge pull request #12306 from Incoming5643/RTD
...
Adds d1 and d100 dice
2015-10-25 05:19:17 -05:00
ef24943bc9
SUPERMATTER SWORD!
...
It's a sword made of supermatter! It'll dust nearly anything! It's hilariously lethal to actually attack with without radiation shielding! It's still eventually lethal even WITH radiation shielding! Admin Only! Good Ideas!
2015-10-25 03:15:07 -04:00
6bfa738a24
Merge pull request #12567 from phil235/EffectSystemTweak
...
Makes effect system code more OOP.
2015-10-22 21:00:10 -05:00
1d2b60b227
Typo fix
2015-10-22 11:20:48 -05:00
b246835ed0
I like this path name better
2015-10-22 11:19:44 -05:00
5527b20a11
Upgrades SS13 to Fifth Edition
2015-10-22 11:15:46 -05:00
e1bad58c4a
Merge pull request #12503 from Robustin/master
...
Pneumatic Nerf
2015-10-22 09:33:02 +03:00
fb7ad8b38f
Merge pull request #12452 from Xhuis/radical
...
Radiation tweaks and a geiger counter
2015-10-22 01:13:00 +02:00
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
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
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
b31f114940
Merge pull request #12510 from Core0verload/tankytanksoftank
...
Buffs big air/oxy tanks damage to 10
2015-10-20 17:47:30 -05:00
bb544c6c92
Merge pull request #12494 from Anonus/timestop
...
Fixes untoggled switchblade force
2015-10-19 20:54:47 -05:00
d1df0bfeff
Merge pull request #12485 from xxalpha/ultrarange
...
Added ultra_range() proc.
2015-10-20 00:17:09 +03:00
8a3ce07b25
update icon
2015-10-19 15:40:33 -05:00
f8056d6d86
Merge pull request #12389 from KorPhaeron/MEDIOCRE
...
Makeshift explosive lances
2015-10-19 22:58:50 +03:00
d83b09255d
no hitting space
2015-10-19 14:52:41 -05:00
a75e359cc6
Buffs big air/oxy tanks damage to 10
2015-10-19 22:26:13 +03:00
6d706ee6d2
Tablecrafting
2015-10-19 14:06:40 -05:00
e82a216447
Changed various instances of range() and orange() to ultra_range().
2015-10-19 20:04:14 +01:00
Razharas
KorPhaeron
Incoming
Jordie
Cheridan
Tkdrg
KiwiFarms
Firecage
MMMiracles
francinum
phil235
KorPhaeron
c0
xxalpha