220 Commits

Author	SHA1	Message	Date
Tupinambis	3b2be43bd8	Slightly increased rubbershot damage from 12.5 to 15 per pellet.	2019-08-27 18:35:08 -05:00
Tupinambis	13638ed5d6	Reverts some changes I deemed unneccesary. Undoes a fuckup	2019-08-26 15:08:36 -05:00
Tupinambis	a4fd2be7f7	Various Shotgun Nerfs.	2019-08-26 14:45:12 -05:00
Poojawa	23333f6ea5	reverts the majority of clean act because it doesn't work properly otherwise	2019-08-20 23:03:31 -05:00
Poojawa	0290a46ddc	Impliments Ghom review, reverts blood list back to component	2019-08-15 12:32:44 -05:00
Poojawa	283b5d050e	Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods	2019-08-08 16:51:53 -05:00
Poojawa	3499d73f6b	Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods	2019-07-31 19:24:39 -05:00
Ghommie	ec2a3ea778	Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"	2019-07-31 18:56:00 +02:00
Ghommie	7065a86841	Revert "Revert "Fixes rocket launchers, buffing their accuracy etc.""	2019-07-19 22:02:22 +02:00
kevinz000	835e91d46e	compile	2019-07-14 05:13:47 -07:00
kevinz000	69f06444e6	smgs	2019-07-09 08:20:45 -07:00
Ghommie	9081b5b773	Revert "Fixes rocket launchers, buffing their accuracy etc." ... This reverts commit 1c6156dd0e.	2019-07-08 07:17:49 +02:00
Ghommie	1c6156dd0e	Fixes rocket launchers, buffing their accuracy etc.	2019-07-08 06:56:20 +02:00
Ghommie	f39a5d2f6a	Ports in RPGs for nuke ops, failsafe uplinks and some carp plushie exploit fix.	2019-06-30 21:53:33 +02:00
Thalpy	1cc0724519	Merge branch 'master' into Dwarf	2019-06-17 12:09:55 +01:00
Fermi	17403bd059	Non-functioning EMP code for review (revert before merging.)	2019-06-13 00:58:54 +01:00
kevinz000	2f2885f1d6	Merge pull request #8558 from Ghommie/Ghommie-cit35 ... Ports in the container_type to reagents flags refactor.	2019-06-08 01:26:28 -07:00
kevinz000	ab565d2483	Merge pull request #8547 from Ghommie/Ghommie-cit29 ... Moves traits to datums and turn the accessors into defines	2019-06-08 01:22:16 -07:00
kevinz000	487461fbda	Merge pull request #8500 from Trilbyspaceclone/patch-158 ... Buffs stun slugs	2019-06-08 01:09:00 -07:00
Fermi	b6788cdd64	Updated projectile sprite.	2019-06-08 01:45:32 +01:00
Fermi	42d0ab4825	Comment cleanup.	2019-06-08 01:31:21 +01:00
Ghommie	7aac9e6280	Updates reagents a bit.	2019-06-07 06:27:04 +02:00
Fermi	2888e1b30b	Dartgun functions as intended.	2019-06-07 00:12:11 +01:00
Fermi	1a42c017ac	DEBUG	2019-06-06 23:23:53 +01:00
Ghommie	d3d2b8d898	should be ready.	2019-06-06 19:24:20 +02:00
Trilbyspaceclone	da67bdf63d	>_>	2019-06-04 12:40:29 -04:00
Fermi	fd22dbfc0d	More fixes. Need to check over merging math.	2019-06-02 03:59:52 +01:00
Fermi	0fa445c153	Fixes and test.	2019-06-02 03:24:01 +01:00
Trilbyspaceclone	ddfe9812a1	Update shotgun.dm	2019-05-31 16:06:26 -04:00
kevinz000	6ed955ddde	Update beams.dm	2019-05-27 14:25:45 -07:00
Poojawa	971ddef989	reverts forensics components. If I can't figure it out, MURDER IT	2019-05-22 04:10:29 -05:00
deathride58	09f77d0438	Nerfs dinks - Ballistic projectiles are now the only projectiles that can emit a dink	2019-03-18 23:02:07 -04:00
deathride58	2d01ac3604	Merge pull request #7868 from Citadel-Station-13/kevinz000-patch-4 ... fixes neurotoxin properly	2019-01-03 07:47:34 -05:00
Trilbyspaceclone	21f111b5e0	[Ready] New mech weapon, Melon Seed Scatter shot! - Requested and helped made by Elllsiy (#7873) ... * Fixing updater * Adds the gunthingy * makes the bullet * Update mecha_designs.dm * Update all_nodes.dm * Fixes stam harm	2019-01-03 04:38:10 -08:00
kevinz000	5c3eb5b00e	Update neurotoxin.dm	2018-12-30 22:22:45 -08:00
kevinz000	96b4171044	Update neurotoxin.dm	2018-12-24 01:52:08 -08:00
kevinz000	6ba2d56435	Update neurotoxin.dm	2018-12-08 04:14:36 -08:00
nik707	dbe0d00cc0	Merge pull request #7728 from deathride58/drowsyebows ... Buffs ebows by making them deal 50 drowsiness	2018-11-19 18:05:40 -06:00
deathride58	f385751c4a	Brings back nonlethal 38 bullets in a semi-nerfed state, keeps the current lethal variant in as a brand new sec autolathe printable ammo box (#7723) ... * Brings back nonlethal 38 bullets in a semi-nerfed state, adds lethal variant for the c38 bullet available at autolathes * Im drunk ignore me	2018-11-16 14:46:54 -08:00
deathride58	7801829908	Makes ebows induce drowsiness	2018-11-16 07:05:46 -05:00
Poojawa	cb342866d6	a few last minute changes from TG ... also changes His Grace from 25 to 10 requirments	2018-09-18 23:12:29 -05:00
Poojawa	99e57fb221	various citadel tweaks/fixes ... remeber to add //citadel edit to base code changes because we're still a downstream and hard syncs are still a thing	2018-09-17 03:26:05 -05:00
Poojawa	284e9d0325	module things, jfc	2018-09-11 07:51:01 -05:00
deathride58	6fa011c1be	INTRODUCING KITCHEN GUN (#7508)	2018-09-07 05:40:35 -07:00
kevinz000	0e0928df26	Merge branch 'master' into fusion_2	2018-09-03 11:17:45 -07:00
deathride58	c8a3f56af6	Merge pull request #7489 from Citadel-Station-13/nanites ... Nanites port	2018-09-03 13:47:28 -04:00
kevinz000	2bf5e6af58	Initial Commit	2018-09-03 10:35:47 -07:00
deathride58	69e1cb5aea	nerfs disablers, buffs tasers (#7507)	2018-08-28 02:41:01 -07:00
kevinz000	b99556c70f	Nanites port from /tg/station, original coder XDTM	2018-08-23 01:16:32 -07:00
kevinz000	5ccda57266	Update wormhole.dm	2018-07-24 01:06:37 -07:00