Commit Graph

9773 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
Leo
65b7f252fc Merge pull request #28487 from Steelpoint/hosrdlocktwo
Head of Security/Research Director fluff items now below standard equipment. Ver 2
2017-06-16 14:45:37 -03:00
bgobandit
7255ab5be6 Knocked-over chairs have materials. (#28456)
* Chair items have mats

* numbers
2017-06-15 19:48:03 -05:00
Robustin
ad25367887 inducer fix (#28464) 2017-06-15 19:03:44 -05:00
Steelpoint
4e25fd93ac InitialCommit 2017-06-15 21:10:44 +08:00
Joan Lung
7a2f047dee Merge pull request #28434 from Cyberboss/BuckleFix
Fixes things getting unbuckled in nullspace
2017-06-14 21:57:35 -04: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
Jordan Brown
dbee77318d Fixes things getting unbuckled in nullspace 2017-06-13 14:43:12 -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
Jordan Brown
af13f405bd Fixes bloody footprints runtime (#28372) 2017-06-13 09:47:40 +02:00
Jordan Brown
652d7b6ade Fixes decal initialize errors (#28370) 2017-06-13 09:45:29 +02:00
Jordan Brown
86160ad69a Fixes gang turret buckler getting enhanced vision (#28366) 2017-06-13 09:35:09 +02:00
Jordan Brown
14e7c6d724 Gang turret control now has DROPDEL (#28365) 2017-06-13 09:34:45 +02:00
kevinz000
5442d07849 Fixes gang turrets buckle code (atleast most of it) (#28364)
* Create manned_turret.dm

* Create buckling.dm

* Update buckling.dm

* Create manned_turret.dm
2017-06-13 09:34:17 +02: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
Joan Lung
cf67807d4d Merge pull request #28351 from lzimann/sprites
Changes all dmis to be lowercase
2017-06-12 17:33:08 -04: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
kevinz000
235ebfa1c2 Adds glowing cybernetic eyes to R&D - No functions except for flashlight! (#27941)
* MY SNOWFLAKE IS TOO STRONG FOR YOU

* rnd design

* Update eyes.dm

* wew

* k

* fix

* ready

* Update eyes.dm

* Update eyes.dm

* updates

* lazylists are shit but whatever

* runtimes funtimes, and case sensitiveness

* cyberbossy

* cyberboss making me break things

* checks for implantation first..

* better

* tested

* dirs

* efficiency

* all gud
2017-06-12 10:15:57 +02: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
3f705c0479 Changes all dmis to be lowercase 2017-06-11 16:05:17 -03: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
d46b1f7a09 Fixes basic spiderlings becoming ice spiders (#28262)
* fix

fixes #14242

* refactors ice spiders into giant_spiders.dm
2017-06-10 19:22:34 +02: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
kevinz000
d8abfaa0fd Create manned_turret.dm (#28215) 2017-06-09 10:41:04 +02: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
Jordan Brown
23eb6e4aec Merge upstream 2017-06-08 16:30:35 -04:00
Tacolizard
5ea7095875 remake 2017-06-08 12:35:32 -07:00
kevinz000
596ef51039 Merge remote-tracking branch 'tgstation/master' into gang_points_refactor 2017-06-08 11:05:12 -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
93bf75b576 Merge pull request #28178 from Expletive/detectivehair
Adds 91 new sprites for the Detective's Fedora and gives it some better booze.
2017-06-08 11:50:55 -04:00