Commit Graph

19656 Commits

Author SHA1 Message Date
bgobandit
ed01357edd This month's spelling fix PR (#28502) 2017-06-17 09:35:30 -03:00
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
QualityVan
a7af10eb56 Adds onions (#28414) 2017-06-16 18:22:31 -03:00
Joan Lung
e995c777bd Makes the messages for Sentinel's Compromise removing holy water more accurate (#28429) 2017-06-16 17:20:22 -03:00
Ashe Higgs
88d3ef2fe8 Hand drill, jaws of life, and emitter grammar tweaks (#28493) 2017-06-16 17:18:56 -03:00
Mike Long
3ddef57ecf Vomit fix (#28492) 2017-06-16 17:18:19 -03:00
Joan Lung
56337d7252 Cultists must be human to run for Cult Master status (#28473) 2017-06-16 14:53:15 -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
Joan Lung
5508678098 Fixes Geis counting dead servants (#28477)
* Fixes Geis counting dead servants

* slightly more better
2017-06-15 20:55:21 -04: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
Leo
dd8fdd10bb Merge pull request #28451 from bgobandit/brigsentences
Reduces default brig times to be consistent with suggested policy.
2017-06-15 10:56:24 -03: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
3315c4c311 People converted to clockcult will actually have their world turn yellow briefly, matching the messages (#28397) 2017-06-13 21:47:29 -03:00
Leo
7ec5c0e5d3 Merge pull request #28255 from optimumtact/revert-28229-revert-28170-observerspeep
Players cannot observe before PREGAME is reached, Version 2
2017-06-13 21:42:09 -03: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
Leo
b55deeda2f Merge pull request #28391 from Cyberboss/mull
Fixes some edge cases with round end and mulligan antags
2017-06-13 21:13:09 -03:00
bgobandit
784336ff61 Changes default brig times to be consistent with Space Law. 2017-06-13 19:42:08 -04:00
Joan Lung
592ab18a80 Merge pull request #28398 from tgstation/lzimann-patch-1
Changes config tag for secret extended
2017-06-13 18:16:37 -04:00
Joan Lung
fc0430e204 Merge pull request #28388 from Cyberboss/patch-130
Fixes borging factory
2017-06-13 18:15:28 -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
Cruix
13e4f6cf6a Refactored advanced camera consoles (#28360)
* Updated advanced camera consoles to be more generic

* Renamed /obj/machinery/computer/camera_advanced/proc/EjectUser() to /obj/machinery/computer/camera_advanced/remove_eye_control()
2017-06-13 15:20:17 +02: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
oranges
c866a77147 Players cannot observe before PREGAME is reached
Ready | Not Ready | Observe is now a three way toggle

The player ready status has been refactored 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 in observing.

All the observer code has been centralised into a single
make_me_an_observer proc on new_player mobs
2017-06-12 20:58:15 +00: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
Leo
bf32579c92 Changes config tag for secret extended 2017-06-12 14:48:04 -03: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
6532461baa Fixes some edge cases with round end and mulligan antags 2017-06-12 12:31:43 -04:00
Jordan Brown
eeaf51ec93 Fixes borging factory 2017-06-12 10:42:31 -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