Commit Graph

19608 Commits

Author SHA1 Message Date
Jordan Brown
6532461baa Fixes some edge cases with round end and mulligan antags 2017-06-12 12:31:43 -04:00
ShizCalev
7cfaafa975 RADIMMUNE species can no longer be used for radiation free DNA research (#28235)
* fix

closes #13451

* check for radimmune instead

* ???

not sure how that got messed up.
2017-06-12 12:35:40 +02: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
Joan Lung
c02c2fa7ad AI liquid dispensers are now more usable (#28320) 2017-06-11 22:50:29 -03: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
Joan Lung
924381d02a Merge pull request #28188 from Xhuis/paper_pinning
Adds the ability to attach papers and photos to airlocks
2017-06-11 18:28:52 -04:00
Ashe Higgs
33329e50b5 Fixes IED sprites inheriting their can's offsets (#28317) 2017-06-11 18:28:22 -04:00
Joan Lung
f1f356a290 Merge pull request #28337 from lzimann/files
Changes all sound files to be lower case, plus standardizes their references
2017-06-11 14:50:41 -04:00
Leo
c9233acd45 Merge pull request #28295 from Xhuis/spirit_sight_fix
Fixes #27738 (Spirit Sight examine text showing you and not the user)
2017-06-11 10:28:52 -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
Joan Lung
aa8af61a87 Merge pull request #28291 from lzimann/doomsday
Some minor refactor to doomsday device
2017-06-10 20:10:33 -04:00
Leo
5cee64f516 Merge pull request #28271 from Cyberboss/patch-110
Fixes pipe dispensers
2017-06-10 21:09:11 -03:00
Joan Lung
c904a68e12 Fixes prolonging prisms potentially consuming power but not activating (#28248) 2017-06-10 18:15:58 -03: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
Xhuis
0a262d0675 Fixes a weird examine text in the Spirit Sight rune 2017-06-09 22:15:04 -04:00
Leo
18419b6859 Merge pull request #28239 from Tacolizard/removesassistants
Fixes communications consoles
2017-06-09 22:08:25 -03:00
Lzimann
10467c30a1 Some minor refactor to doomsday device 2017-06-09 20:55:10 -03:00
Robustin
793aab19e1 Hotfix the hotfix 2017-06-09 17:51:49 -04:00
Robustin
457d747b03 Summon fix 2017-06-09 14:20:05 -04:00
TrustyGun
1db56a3d58 Clown Toy Box + Wooden Crates (#28227) 2017-06-09 13:01:51 -03:00
Xhuis
46ded8a4ef does the thing 2017-06-09 11:15:46 -04:00
Jordan Brown
17ad4071c1 Fixes pipe dispensers 2017-06-09 10:54:42 -04:00
Leo
a2a1fa47a3 Merge pull request #28207 from optimumtact/sgtpepperslonelyheartsclub
Medical record summaries are now single inputs as well
2017-06-09 11:29:12 -03:00
Leo
1699b98f76 Merge pull request #28218 from optimumtact/hamish_the_cow_gets_brushed
Some other code now uses ai status display list
2017-06-09 11:28:22 -03:00
Jordie
d05b3c51d8 Merge pull request #28209 from lzimann/whyisthishere
Moves borer completion to gamemode
2017-06-10 00:00:07 +10:00
ShizCalev
46fe620aee gg (#28219)
fixes #28216
2017-06-09 10:42:16 +02:00
kevinz000
d8abfaa0fd Create manned_turret.dm (#28215) 2017-06-09 10:41:04 +02:00
Joan Lung
343ed953db Fixes clockwork armor bitflags (#28203) 2017-06-09 10:26:10 +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
Leo
003c2bc363 Merge pull request #28204 from optimumtact/hewalksamongus
Security record crime details is now a single line input box
2017-06-08 21:08:42 -03:00
ShizCalev
f2d829261a [Typo] Duffel Bag (#28200) 2017-06-08 19:16:20 -03:00
oranges
dfef4d93ea Some other code now uses ai status display list 2017-06-08 21:16:58 +00: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
Tacolizard
4dcfe4ec21 remake 2017-06-08 12:14:15 -07:00
kevinz000
596ef51039 Merge remote-tracking branch 'tgstation/master' into gang_points_refactor 2017-06-08 11:05:12 -07:00
Jordan Brown
93e3fa18a2 Revert "Players cannot observe before PREGAME is reached" 2017-06-08 13:04:58 -04: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
Leo
fbf9f42a5d Merge pull request #28170 from optimumtact/observerspeep
Players cannot observe before PREGAME is reached
2017-06-08 12:09:31 -03:00
Xhuis
d0e03595b6 Adds photo sprites, support for open ones 2017-06-08 10:13:20 -04:00
Jordan Brown
535dc67a3d Fixes badass syndie 2017-06-08 09:25:35 -04:00
Robustin
b409a52d42 Blood Cult Nerf: Restricted Nar-Sie summoning locations (#28137)
* Restricted Blood Cult Summoning

* fixed warning
2017-06-08 07:28:40 -04:00
Expletive
6b288af33f EMP Proofing a camera takes one sheet of plasma (#28180) 2017-06-08 12:31:29 +02:00
oranges
507ee7f223 Players cannot observe before PREGAME is reached
Ready | Not Ready | Observe is now a three way toggle

The player ready status has been refatored into an ENUM of the three
states, READY, NOT_READY and OBSERVING

if the tickerstate is at least PREGAME they will spawn as observers,
before then you can only register your interest
2017-06-08 06:46:38 +00:00