Jordan Brown
bdc410eb03
Merge pull request #29253 from Ergovisavi/weak_point
...
Adds another planetstation mob, the "Seedling"
2017-08-02 16:37:33 -04:00
Jordan Brown
09a50d9bfe
Merge pull request #29621
2017-08-02 09:46:31 -04:00
Jordan Brown
6806607425
Merge pull request #29369
2017-08-02 09:45:05 -04:00
Jordan Brown
f9acd09f04
Fixes silicons not returning an Initialize hint ( #29603 )
2017-08-01 18:10:46 -05:00
Jordan Brown
47dea05347
Merge pull request #29591
2017-08-01 09:39:44 -04:00
Jordan Brown
b91ba81458
Merge pull request #29592
2017-08-01 09:39:00 -04:00
Jordan Brown
3ec4aec215
Merge pull request #29601
2017-08-01 09:37:28 -04:00
AnturK
d5f0c10ac3
Makes cyborg remote interaction limited.
2017-08-01 13:56:18 +02:00
shizcalev
99624b8e74
further spellchecking
2017-07-31 23:09:08 -04:00
Ashe Higgs
0a32812982
Separates actions.dmi into multiple files ( #29587 )
...
actions.dmi is way too cluttered and messy, and with inhands getting the axe I decided to fix this, too. I separated the major categories of actions into their own files, like antagonist-specific actions and spells. A full list of categories is found here:
actions_AI.dmi contains AI-specific actions;
actions_clockcult.dmi contains clockcult-specific actions, and scripture quickbind icons;
actions_cult.dmi contains cult-specific actions as well as sintouch;
actions_flightsuit.dmi contains flightsuit and flightpack actions;
actions_items.dmi contains minor item-specific actions such as the hierophant club and jetboots;
actions_mecha.dmi contains actions related to mechs;
actions_minor_antag.dmi contains antag-related actions with no other spot, like devils/abductors;
actions_revenant.dmi contains revenant ability icons;
actions_silicon.dmi contains minor silicon and console icons, like pAI and xenobiology consoles;
actions_slime.dmi contains slime actions;
actions_spells.dmi contains icons for all spells;
actions_xeno.dmi contains icons for all xeno actions; and
backgrounds.dmi contains backgrounds for the action buttons.
2017-08-01 14:26:42 +12:00
Joan Lung
cf0d087945
since hey we handled that
2017-07-31 09:31:08 -04:00
Joan Lung
50d5c40cc5
Merge branch 'master' of https://github.com/tgstation/tgstation into aicameratweak
2017-07-31 09:29:47 -04:00
Joan Lung
9c323d97a5
Cyborgs grabbing ore works consistently ( #29577 )
...
* Cyborgs grabbing ore works consistently
* i am very chaotic but I fix my shit
2017-07-31 14:09:27 +02:00
kevinz000
c1e2710d9d
Update observer.dm
2017-07-30 21:24:16 -07:00
Joan Lung
78530a0ceb
The AI's internal camera functions better
2017-07-30 23:31:38 -04:00
Cyberboss
662cfd37da
Merge pull request #29412
2017-07-30 20:54:44 -04:00
Cyberboss
f5f3758df3
Merge pull request #29288
2017-07-30 20:54:22 -04:00
XDTM
4865549b9f
Fixes a lot of eye damage procs ( #29565 )
2017-07-30 09:16:18 -04:00
Cyberboss
5116dd964a
Merge pull request #29547
2017-07-29 20:41:08 -04:00
ShizCalev
d525b18d8d
Completes major inhand split project ( #29574 )
...
* Completes split project
* More work on it. Should be more or less finished
2017-07-29 16:47:37 -03:00
XDTM
97fc07898c
Merge branch 'master' into Hallucinations3.0
2017-07-29 12:43:18 +02:00
XDTM
59fdce8e66
Lotsa stuff
2017-07-29 12:36:48 +02:00
Unknown
2efdc78681
this fixes the PR
2017-07-29 03:52:55 +02:00
Qustinnus
7ecbb8a1b2
Merge branch 'master' into disgustport
2017-07-29 03:06:25 +02:00
Joan Lung
2d1fd03b72
review
2017-07-28 12:17:02 -04:00
Leo
98d4bc6eee
Merge pull request #29529 from ChangelingRain/bowremoval
...
Removes bows
2017-07-28 00:11:50 -03:00
Xhuis
150d6c48c9
Adds a notice for medbots on failed heals
2017-07-27 20:07:20 -04:00
Jordan Brown
f4e1be467c
Merge pull request #29502
2017-07-27 09:43:16 -04:00
Jordan Brown
f66bc2bebb
Merge pull request #29512
2017-07-27 09:43:06 -04:00
Joan Lung
36d70f3114
Removes bows
2017-07-26 18:39:57 -04:00
Jordan Brown
58fdff5b97
Merge pull request #29488
2017-07-26 16:43:02 -04:00
Jordan Brown
0b6376f449
Merge pull request #29487
2017-07-26 16:42:59 -04:00
shizcalev
8ebf6b6a43
cleaned up paper
2017-07-26 05:35:05 -04:00
BeeSting12
f4329f4ebe
i really hope this will fix it
2017-07-26 00:40:14 -04:00
Joan Lung
6d7e3f2281
Lava is no longer a plating subtype ( #29463 )
2017-07-25 22:16:02 -03:00
oranges
b44bb6ffad
Revert "Adds the hivebot invasion event ( #28514 )"
...
This reverts commit 78a2e5c4c3 .
2017-07-25 23:06:38 +00:00
BeeSting12
f5f8f7f369
gives service borgs one too
2017-07-25 13:11:11 -04:00
KorPhaeron
69690c1826
Small
2017-07-24 22:17:09 -04:00
BeeSting12
a97d4e87f8
vwejiwcqcwvwfbv
2017-07-24 19:11:49 -04:00
Qustinnus
e6d95a2beb
this kills the proc
2017-07-24 11:45:03 +02:00
Xhuis
d3d05c53a5
you CHECK those zones
2017-07-23 14:54:34 -04:00
Xhuis
5ad39338f5
Stabbing yourself is now always accuate
2017-07-23 12:46:24 -04:00
Ashe Higgs
f12a6cc012
Medibots now have the proper icons ( #29413 )
...
* Medibots now have the proper icons
* Initialize!
2017-07-22 20:52:19 +02:00
Joan Lung
23183ec64b
The Hierophant will now release a burst when melee attacking instead of actually hitting its target ( #29343 )
...
* The Hierophant will now release a burst when melee attacking instead of actually hitting its target
* doctweak
* no message
2017-07-22 20:38:32 +02:00
AnturK
8469afdc4e
Fixes some human deletion runtimes. ( #29396 )
2017-07-22 12:59:02 -03:00
Leo
92f3ab594a
Merge pull request #29409 from ChangelingRain/dronepingfix
...
Fixes a drone ping issue
2017-07-21 20:19:32 -03:00
Ergovisavi
0538bc222f
Seedling uses a screen object instead of an overlay, beam changed to a kill-sat style one
2017-07-20 19:46:12 -07:00
Joan Lung
9afefa0064
The blood-drunk miner will fire its KA a bit more often ( #29378 )
...
* The blood-drunk miner will actually fire its KA a bit more often
* this too
* )
* k
2017-07-20 18:47:45 -05:00
Joan Lung
83fc11fa8c
bang bang
2017-07-20 19:23:34 -04:00
Joan Lung
c1512653f5
Colossus's shotgun is now a static-spread blast of 5 bolts
2017-07-20 19:18:36 -04:00