Commit Graph

837 Commits

Author SHA1 Message Date
AnturK
895406cd36 Merge pull request #17428 from Dahka/New_Syringes
Adds three new syringes
2016-05-24 17:37:40 +02:00
c0
fb2a0961ff "Toolbox Arm" printable at exosuit fabricators and protolathes 2016-05-21 06:35:32 +03:00
Joan Lung
c79c7f0d86 Merge pull request #17619 from phil235/FixRnDThrow
Fix bundle. experimentor, rnd machines, mob throwing
2016-05-13 17:36:51 -04:00
phil235
487fb01366 Properly sever the link between rd computer and protolathe/circuit imprinter/destructive analyzer when the rd computer is screwdrived. 2016-05-13 22:23:16 +02:00
phil235
a49e4cf87d Fixes experimentor having no sprite when panel open.
Fixes panel opening deconnecting the wrong rnd console
Fixes not being able to throw mobs.
2016-05-12 21:37:18 +02:00
TechnoAlchemist
4705efa6da Adds new items to the mining vendors. (#17362)
* Adds new items to the mining vendors, also adds tracking implanter since that didn't exist before.

* woops

* Fixes tracking implants for miners, makes medipens not OD you on tricord.

* Actually doesn't OD on tricord now

* Chemical changes.

* Upgraded the jaunter into the wormhole lifebelt

🆑 coiax
rscadd: The Free Golems have developed the jaunter into the  wormhole
lifebelt, which automatically teleports the user when they fall in a
chasm or suffer a major medical emergency. Must be worn on the belt to work.
/🆑

Please don't mistake a random teleportation in crit for saving a user's
life, the Supply channel gets a notification, but suit sensors are
required to find them, and there's no guarantee the location picked is
safe (for example, the Toxins Test Site is a valid jaunt destination,
along with in the middle of the slime cages in Xenobiology).

* Adds modification kit.

* Golem ship now has its own /area

And a bluespace beacon.

* 5 tick medijaunt, no radio, golem jaunters + areas

The number of ticks before a medical emergency jaunt happens is now
five. No radio message is produced.

Free Golems now have no restrictions on what they can purchase. Wormhole
jaunters now specifically drop golems near their ship.

* Modkits remove the race restrictions from KAs.

* Buffs buffs buffs

I'd say something, but I'm sure I'd regret it later.

* Advanced lifebelts, golem superiority

* Removes modkit from minervendors, adds modkit to RnD!

* COMPILE DAMN YOU!!

* I made it compile

* Honor to my country, not to you :(

* fuck

* h-haha?

* Kor you know I would never actually ban you

* i could personally care less for HBls adminning style
2016-05-11 22:19:47 -05:00
lordpidey
07daf80144 Xenobio slime console now gives error messages upon failure.
* Fixes #16998

* Changes spacing within output.
2016-05-10 09:44:34 -05:00
Dahka
91b3a03421 Add change suggested by RemieRichards, change research costs again. 2016-05-08 20:27:39 -03:00
Core0verload
a66c2f4418 Machine/computer boards and frames refactor (#17300)
* Map Changes

* Machine/console boards and frames refactor

* More board changes
2016-05-08 12:11:18 +02:00
Dahka
c35c3055a4 Increased syringes production and research cost 2016-05-06 13:37:16 -03:00
Dahka
e9a74db93a adds piercing syringe and design to protolathe 2016-05-05 21:45:38 -03:00
phil235
524a55a757 Merge branch 'master' of https://github.com/tgstation/-tg-station into Dismemberment
Conflicts:
	code/datums/martial.dm
	code/game/gamemodes/changeling/powers/fleshmend.dm
	code/modules/mob/living/carbon/carbon.dm
2016-05-05 21:57:10 +02:00
phil235
68da092009 Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior. 2016-05-05 18:17:51 +02:00
c0
19af2d58d5 Removes "Exosuit Module" from mecha board design names 2016-04-30 10:20:25 +03:00
Joan Lung
6fc1d4fde4 Blobs can no longer eat the supermatter (#17205)
* Blobs can no longer eat the supermatter

* phil'd

* phil'd
2016-04-29 20:29:20 +02:00
phil235
2ad8d4a392 * Fixes the holosign_creator's sign counter not going back up when one of its holosign is destroyed.
* Fixes the lack of second argument in alien/stun()
* Fixes the sleeping alert not being updated properly when a mob asleep is killed then revived.
* Fixes timestop effect leaving mobs unable to move forever in some cases.
* Fixes teleporter hub and station staying active when the hub's panel is open, despite the hub's open panel sprite looking offline. The Hub and station now use their own iconfile icons/obj/machines/teleporter.dmi (similar what most machines have).

* I've moved all mob's status adjustment procs (Stun(), Paralyse(), blur_eyes() adjust_drugginess(), etc...) into specific files (named "status_procs.dm") so they're easier to find. I've added a third argument to stun adjustments procs to ignore the CANSTUN flag. I've also changed the weaken procs to have the ignore_canweaken argument be the third argument, so all status adjustment procs have amount as first arg, updating the mob or not as second, and when necessary an ignore_x as third arg.
2016-04-28 00:13:15 +02:00
Cheridan
3a91fab55c Merge pull request #17163 from phil235/ImprinterFix
Imprinter fix
2016-04-27 12:41:16 -05:00
phil235
33d84ef73f Fixes inserting reagents in RnD machines 2016-04-27 13:05:13 +02:00
phil235
9657f328ec Fixes Reagent insertion in RnD machines 2016-04-27 13:04:05 +02:00
phil235
f4f09704eb fixes not being able to pour reagents in circuit imprinter/protolathe 2016-04-27 13:03:19 +02:00
phil235
dc730e9b5b Fixes typo making the destructive analyzer always be busy. 2016-04-27 01:00:39 +02:00
phil235
fcf544283d Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
2016-04-24 21:22:37 +02:00
phil235
b146131a34 Second commits.
This contains the changes to item_attack.dm
Obj/attackby() now follows a similar structure as mob/living/attackby. It calls attack_obj() (like attack() but for obj) which calls attacked_by (just like attack() does)
The use of the NOBLUDGEON flag changes a bit, it is now used to signify the item cannot be used as a melee weapon at all. No attack animation, no attack message. I've given this bitflag to many items that have an afterattack() so as to not both attack and do the special action (among those items: the rcd)

There's also the code changes to attacking machines: attacking any machine now give a proper message and a sound. And with this, I made more machines breakable (using a health var and the very little used BROKEN stat). Most notably, tables can now be attacked when on harm intent and be destroyed.

The newly destroyable machines have a take_damage() proc used by all sorts of attack (weapon, xeno, animal, hulk, mech melee, gun projectile, thrown items).

There's some more stuff in there, see the PR's description and comments.
2016-04-24 20:37:00 +02:00
KorPhaeron
25875cda18 Removes commented out recipes 2016-04-23 14:09:45 -05:00
KorPhaeron
ad4782ac41 Tesla Revolver 2016-04-23 13:55:03 -05:00
KorPhaeron
3e3001acb2 Merge remote-tracking branch 'refs/remotes/tgstation/master' into USA 2016-04-22 12:21:14 -05:00
Jordie
03067837fa Merge pull request #16976 from nullbear/grenade-tweaks
tiny fixes to my stuff. (Sorry! >~<)
2016-04-22 20:29:53 +10:00
nullbear
a7c9c80977 tiny fixes to little things
allows deconstruction of xenobio computer again.

renames chem grenades to chem grenades.

makes advanced grenades scale up their unit thing.

makes chemical payload scale up with matter bin used in construction,
and more accessible in general
2016-04-22 03:20:47 -07:00
KorPhaeron
a78ce8712e Gatling Gun icon fixes 2016-04-21 20:59:07 -05:00
KorPhaeron
00c5b0bed3 Nuclear Gun cost revert 2016-04-21 20:29:00 -05:00
KorPhaeron
5a813a96a5 Gatling Laser 2016-04-21 20:26:13 -05:00
KorPhaeron
751e309d79 Merge pull request #16959 from LatD/xenobiomonkey
Fixes xenobio console breaking with monkey numbers
2016-04-21 02:23:37 -05:00
Cheridan
cc313310d9 Merge pull request #16985 from Core0verload/mecha-plasma-cutter
Fixes Mecha Plasma Cutter design
2016-04-20 12:00:55 -05:00
KorPhaeron
bd5eb1d02b Merge pull request #16958 from erwgd/AutolatheMakeMilbelts
Adds tray to autolathe designs
2016-04-19 16:05:28 -05:00
c0
ba91db5e0c Mecha Plasma Cutter 2016-04-19 15:58:25 +03:00
KorPhaeron
3527347160 Shock Revolver 2016-04-18 21:29:43 -05:00
LatD
9ff553c77f Forgot to remove one var 2016-04-18 21:07:08 +03:00
LatD
a17a9a4b14 Change var to round 2016-04-18 21:06:27 +03:00
LatD
b1ed5c18ff Fix possible but unlikely exploit 2016-04-18 19:49:21 +03:00
LatD
6fc6989b9c Update xenobio_camera.dm 2016-04-18 19:27:28 +03:00
erwgd
23700e33ff Added tray datum to autolathe_designs.dm 2016-04-18 10:43:26 +01:00
Cheridan
d671bf573c Merge pull request #16858 from nullbear/Chemical-Explosives
Adds Chemical Explosives
2016-04-18 02:35:56 -05:00
nullbear
1cb85c3024 Fixes monkey cube Dupe Glitch
fixes https://github.com/tgstation/-tg-station/issues/14667

Adds some consistency, allowing monkeys to be drag dropped onto the
monkey recycler, like they are with the disposals chutes.

Prevents grabs from being placed in disposals, as they were being
before.
2016-04-15 21:36:34 -07:00
Cheridan
2f52e7daf9 Merge pull request #16829 from erwgd/LetUsMakeDinnerware
New autolathe category for kitchen+bar items
2016-04-14 11:56:21 -05:00
erwgd
9d6247c890 Removed bowl making code from biogenerator.dm
Added bowl design to autolathe_designs.dm
Changed bowl materials to 500 glass
2016-04-14 17:14:01 +01:00
Joan Lung
d8a724f1c4 Merge pull request #16806 from coiax/airlock-painter
Airlock painter now printable in autolathe; plus meme suicides
2016-04-14 09:29:10 -04:00
nullbear
df32979866 Adds Chemical Explosives
see changelog for details
2016-04-13 13:09:41 -07:00
erwgd
ca88d3f025 added shot glass and shaker designs to autolathe
defined materials for shot glass and shaker
2016-04-13 17:17:15 +01:00
AnturK
4b7f274e3f Merge pull request #16742 from Core0verload/master
Cargo Exports (and a very basic economy system)
2016-04-13 17:41:05 +02:00
KorPhaeron
62939a09f0 Merge pull request #16733 from octareenroon91/patch-35
Add Drone Shell to Protolathe for ease of exporting drone data disks to autolathes
2016-04-12 23:54:47 -05:00