Commit Graph

6138 Commits

Author SHA1 Message Date
Expletive
fe73e0e920 Gives the captain a somewhat robust golden fountain pen, and some others an average fountain pen. (#28382) 2017-06-16 22:12:10 -03:00
Ashe Higgs
88d3ef2fe8 Hand drill, jaws of life, and emitter grammar tweaks (#28493) 2017-06-16 17:18:56 -03:00
Leo
a95aa5443f Merge pull request #28395 from Thunder12345/genuinecatproducts
Adds genuine cat fur products
2017-06-16 14:51:03 -03:00
Robustin
ad25367887 inducer fix (#28464) 2017-06-15 19:03:44 -05:00
kevinz000
b6a4a32633 Adds a check_tick to pneumatic cannon examine (#28345) 2017-06-14 09:59:40 -03:00
Joan Lung
56e391561b Merge pull request #28413 from optimumtact/cellulardestruction
Fix runtime in inducer emp act
2017-06-13 22:22:30 -04:00
Joan Lung
0e29560b9e Merge pull request #28404 from Expletive/fancymedalbox
Medal lockboxes are now fancy, and will accurately represent their contents.
2017-06-13 20:40:51 -04:00
Joan Lung
91f26d2766 Merge pull request #28399 from Tacolizard/fireaf
Minor flamethrower fix
2017-06-13 18:12:38 -04:00
Expletive
7d4b3c38f7 Mutable Appearances 2017-06-13 10:32:35 -07:00
Joan Lung
fc7654aca1 Merge pull request #28393 from Cyberboss/patch-131
[s] Fixes charter exploit
2017-06-13 13:12:15 -04:00
kevinz000
968a384605 Fixes dead PKborgs having active dampener fields (#28214)
* Create robot_items.dm

* on mob death
2017-06-13 09:23:18 +02:00
oranges
14969aa8a9 Fix runtime in inducer emp act
Was not passing the severity into the cell's emp act
2017-06-13 02:43:52 +00:00
Expletive
4aedb9c327 changesrequested 2017-06-12 14:48:37 -07:00
Expletive
5396d60f44 Flashdarks can't be used for examining eyes/mouth. (#28352) 2017-06-12 18:36:57 -03:00
Expletive
1609a4aeb1 Makes medal boxes fancy. 2017-06-12 13:53:50 -07:00
Tacolizard
49b6c29641 maintainers force me 2017-06-12 13:14:40 -07:00
Tacolizard
2cf63eaf20 this shits fire 2017-06-12 12:15:52 -07:00
Thunder12345
93a6dcb02e cats 2017-06-12 17:49:28 +01:00
Jordan Brown
275e9abfad Fixes charter exploit 2017-06-12 12:37:40 -04:00
Jordan Brown
d73810f9f1 IED code cleanup (#28318) 2017-06-11 22:47:30 -03:00
Leo
93f1e1b605 Merge pull request #28331 from QualityVan/lighters
Lighters need to be on
2017-06-11 22:44:08 -03:00
Ashe Higgs
33329e50b5 Fixes IED sprites inheriting their can's offsets (#28317) 2017-06-11 18:28:22 -04:00
Lzimann
3e34eb9e3f Changes all sounds to be lower case, plus standardizes their references 2017-06-11 00:38:45 -03:00
QualityVan
c18f68df6d Lighters need to be on 2017-06-10 22:06:35 -04:00
ShizCalev
eb9f0baeec Makes RADIMMUNE species incompatible with radiation based DNA injectors (#28246)
* dna injector

* why the fuck is my git client doing this
2017-06-10 19:19:12 +02:00
Mike Long
8e07021c0d Adds F.R.A.M.E. cartridge (#28113)
* Refactors old PDA virus cart code

* Adds F.R.A.M.E. cartridge

* Adds FRAME to uplink

* FRAME can now be used to push telecrystals to the target.

* Makes cartridges more extensible.

* Fixes compilation

* Fixes exploit involving removing target's TC if used multiple times.

* Removes redundant var, in accordance with convention.

* Things actually work now.  Whoops.
2017-06-10 19:17:33 +02:00
TrustyGun
1db56a3d58 Clown Toy Box + Wooden Crates (#28227) 2017-06-09 13:01:51 -03:00
Joan Lung
7ec67bc960 Merge pull request #28202 from Tacolizard/medalmemesv2ultra
Gives the RD and HoS medal lockboxes
2017-06-08 21:36:06 -04:00
ShizCalev
f2d829261a [Typo] Duffel Bag (#28200) 2017-06-08 19:16:20 -03:00
Tacolizard
5ea7095875 remake 2017-06-08 12:35:32 -07:00
Jordan Brown
f4ffde7a09 Merge branch 'master' of https://github.com/tgstation/tgstation into goonchatv3 2017-06-08 12:54:27 -04:00
Joan Lung
81ae23ace9 Merge pull request #28189 from Xhuis/defib_paddle_fix
Fixes #8044, being able to hold defib paddles while dead, by removing NODROP from them
2017-06-08 11:57:30 -04:00
Joan Lung
0832c97527 Merge pull request #28163 from QualityVan/zerocables
Prevents cyborgs from extruding materials
2017-06-07 20:25:05 -04:00
Jordan Brown
5bbbd26739 Merge branch 'master' into goonchatv3 2017-06-07 20:06:46 -04:00
Leo
48649596e2 Merge pull request #28150 from ShizCalev/ce-belt
Fixes CE's hand drill changing size
2017-06-07 16:14:08 -03:00
Xhuis
60073e279e Removes NODROP from defibrillator paddles 2017-06-07 12:01:06 -04:00
Leo
4f3d720c93 Merge pull request #28124 from Shadowlight213/whywasthisevenadded
Adrenaline and freedom implants in rnd have been replaced with tracking and chem ones
2017-06-07 11:07:13 -03:00
Expletive
8413960d8e A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals) (#28115) 2017-06-06 22:26:56 -03:00
QualityVan
8c33045cd9 Prevents cyborgs from extruding materials 2017-06-06 20:02:24 -04:00
swindly
b976845de3 Weaponizes station charters (#28111) 2017-06-06 20:40:01 -03:00
shizcalev
eb3756b8eb fixed
fixes #28120
fixes #28136
2017-06-06 15:36:25 -04:00
Jordan Brown
ccfaf07a5a Merge branch 'goonchatv3' of https://github.com/Cyberboss/tgstation; branch 'master' of https://github.com/tgstation/tgstation into goonchatv3 2017-06-06 09:18:44 -04:00
Leo
c1749f4fa4 Merge pull request #28091 from Expletive/fix28082
Fixes #28082 : Private Security cutouts have icons.
2017-06-06 09:12:26 -03:00
Shadowlight213
0150de51c3 Adrenaline and freedom implants in rnd have been replaced with tracking and chem ones 2017-06-05 20:58:12 -07:00
thefastfoodguy
2bdd2342a6 Flashlight suduko (#28053) 2017-06-05 18:27:44 -03:00
Joan Lung
5884071627 Renames Clockwork Proselytizers to Replica Fabricators (#28062) 2017-06-05 14:52:31 -03:00
Expletive
506a351f16 Fix #28082 2017-06-05 01:46:36 -07:00
InsaneHyena
5713a44048 Removes donut steelpoint (#28041) 2017-06-05 00:12:26 -03:00
Joan Lung
d5e608807f Only human and silicon servants can help recite multi-invoker scriptures (#28049) 2017-06-04 21:22:55 -03:00
oranges
ca6f4cfc35 refactor another spawn cooldown (#28022) 2017-06-04 12:29:41 +02:00