Commit Graph

16309 Commits

Author SHA1 Message Date
oranges
24cf031cb1 Merge pull request #17968 from Bobylein/chem-bottles-rework
Pill icons based on master reagent and transparent chem bottles
2016-06-07 09:56:11 +12:00
Cheridan
cad969ce7b Merge pull request #18257 from KorPhaeron/snow
redpills snow turfs
2016-06-06 00:40:40 -05:00
Kevin
e584256330 removed pill changes 2016-06-06 00:10:32 +02:00
KorPhaeron
8f03e896bc Missing equal sounds 2016-06-05 16:50:50 -05:00
Jack Edge
5fa854e252 Fixes a runtime when the AI uses binary chat
Might fix some bugs? Bugs that I introduced, but phil mentioned a
runtime.
2016-06-05 18:52:39 +01:00
oranges
69bd3575e3 Merge pull request #18228 from ChangelingRain/swordofRATVAR
Additional Ratvar conversion effects and related changes
2016-06-06 01:35:26 +12:00
oranges
e1055df57f Merge pull request #18235 from coiax/when-it-happens-we-will-know
[s] Makes winning a pulse rifle little more noticable
2016-06-06 01:33:12 +12:00
oranges
227b404a5e Merge pull request #18144 from coiax/robustin-blew-my-mind
Adds two Fun verbs for admins (and one boring one)
2016-06-06 01:32:50 +12:00
oranges
c09046e3f1 Merge pull request #18201 from PKPenguin321/cmo-implanter
Refines autoimplanter code, gives CMO single use autoimplanter for HUD augment
2016-06-06 01:25:52 +12:00
oranges
2bc1504007 Merge pull request #18226 from MMMiracles/evenMORERUINS
lava ruins
2016-06-06 01:24:43 +12:00
oranges
050c42ff5e Merge pull request #18174 from coiax/holodeck-cold
Adds two new holodeck levels
2016-06-06 01:23:43 +12:00
oranges
cc99a4803c Merge pull request #18233 from kevinz000/gravitygunspleaseworkedition
Remake: Gravity guns
2016-06-06 01:19:08 +12:00
oranges
a435f7dc74 Merge pull request #18150 from PKPenguin321/salty
gives salt shakers a suicide_act
2016-06-06 01:18:23 +12:00
Nerd Lord
e816738280 Merge branch 'master' of https://github.com/tgstation/tgstation into swordofRATVAR 2016-06-05 09:03:22 -04:00
AnturK
8edc244dc7 Merge pull request #18220 from KorPhaeron/ruin_runtimes
(Hopefully) Fixes some ruin runtimes
2016-06-05 14:44:26 +02:00
AnturK
cd67c17a80 Merge pull request #18175 from Iamgoofball/patch-57
fixes gibtonite runtime
2016-06-05 14:43:30 +02:00
AnturK
edbddb0aad Merge pull request #18194 from KorPhaeron/fix2
Fixes centcomm commander corpse outfit/Mob spawner edits.
2016-06-05 14:39:52 +02:00
Jack Edge
b082011d22 Adds mass zombie cure, for the boring people 2016-06-05 13:05:21 +01:00
Jack Edge
a35a0d3306 Adds two Fun verbs for admins
- Mass Zombie Infection - gives all humans a zombie infection organ to
all humans, which will make them reanimate on death.

- Polymorph All - This applies a bolt of change to all living mobs.
Slightly laggy.
2016-06-05 12:54:35 +01:00
TechnoAlchemist
9db2f57f36 Kills me, fucking, like, blows my brains out or something. (#18231) 2016-06-05 03:10:13 -05:00
Nerd Lord
f3fa0c3f38 is this a turf 2016-06-04 21:56:10 -04:00
KorPhaeron
9fe108be27 Uses proper defines 2016-06-04 19:50:48 -05:00
Joan Lung
eb138256d5 Merge pull request #18227 from lzimann/med
Fixes medbeam not stopping properly when equipped to a slot
2016-06-04 20:50:31 -04:00
Joan Lung
4277d9bca2 Merge pull request #18215 from KorPhaeron/lava_staff_fix
[s]Fixes lava staff being used through walls
2016-06-04 20:48:50 -04:00
Razharas
93f8605753 Merge pull request #18224 from ChangelingRain/shuttlecrush
Slightly improves shuttle crushing
2016-06-05 02:46:33 +03:00
Joan Lung
4d7a3836a1 Merge pull request #18192 from lzimann/bz
Adds a way to filter BZ gas in air alarms and trinary filters
2016-06-04 19:43:25 -04:00
KorPhaeron
84bda094ba Fixes snow 2016-06-04 17:23:49 -05:00
Joan Lung
715e97e4b0 Merge pull request #18151 from RemieRichards/SlimeAttack!
Slimes may now be ordered to attack
2016-06-04 17:25:34 -04:00
Joan Lung
d81db92008 Merge pull request #18214 from coiax/follow-link-define
Refactors all (F) links into using a define
2016-06-04 14:36:31 -04:00
Nerd Lord
9405446e08 important check 2016-06-04 11:20:59 -04:00
Nerd Lord
c51b1503ac clockwork windoors 2016-06-04 10:27:27 -04:00
Nerd Lord
f8bd263eec Merge branch 'master' of https://github.com/tgstation/tgstation into swordofRATVAR
Conflicts:
	icons/effects/effects.dmi
2016-06-04 07:34:13 -04:00
Jack Edge
1453c4c089 Makes winning a pulse rifle little more noticable
🆑 coiax
rscadd: When someone wins a pulse rifle via arcade games, everyone dead
and admined are notified. Also it comes with a firing pin now.
/🆑
2016-06-04 12:22:37 +01:00
kevinz000
0073ffc45d naming 2016-06-04 02:45:43 -07:00
kevinz000
e8ddb7a4d7 why the fuck 2016-06-04 02:44:25 -07:00
kevinz000
8b79a21698 why 2016-06-04 02:39:38 -07:00
kevinz000
607c4be5f9 hjope this works 2016-06-04 02:38:07 -07:00
kevinz000
4b2077fd6b fortheloveofallthatisholyworkplease 2016-06-04 02:30:38 -07:00
TechnoAlchemist
d75ded29fa Adds all-seeing-eye to necropolis chests. (#18160)
* Swaps xray syringe with new item.

* blankspace

* standards
2016-06-04 02:52:04 -05:00
Remie Richards
13dfd8dbf7 Peacekeepers now use Eye overlays, which means they close their eyes when they die :( (#18209)
Peacekeepers now have Eye overlays for being servants of Ratvar
Redid some of the shading and lineart for colours for Peacekeepers
2016-06-04 01:23:14 -05:00
Nerd Lord
3793e6187a Addition Ratvar conversion effects and related changes 2016-06-03 23:19:13 -04:00
Joan Lung
6fd1424619 Merge pull request #18085 from Xhuis/earsplitting_string
Clockwork Patch III
2016-06-03 19:55:04 -04:00
Lzimann
dcc7d6d99e Fixes medbeam 2016-06-03 20:52:02 -03:00
MMMiracles
6044713cea gives mining autorifles 2016-06-03 19:02:34 -04:00
LatD
ee7ef0d4d7 Fixes experimentor doing many reactions with one event (#18180)
* Fix many reactions happening at once

* Small fix
2016-06-03 18:00:15 -05:00
Nerd Lord
f653f38418 it's literally just to make protector holos marginally fancier under 'hit by shuttle' conditions 2016-06-03 17:35:54 -04:00
Nerd Lord
10520995a2 Slightly improves shuttle crushing 2016-06-03 17:19:09 -04:00
KorPhaeron
b7b4cc01ed Throwing Runtime Fix (#18076) 2016-06-03 22:22:03 +02:00
KorPhaeron
61f7383542 Fixes some ruin runtimes 2016-06-03 15:01:14 -05:00
Iamgoofball
a3c6571cfd Fixes #18167 (#18170) 2016-06-03 14:48:32 -05:00