bf72887e38
Merge pull request #28903 from Cyberboss/swarmerfix
...
Swarmer cleanup
2017-07-01 18:14:54 -03:00
685dba0f5a
Merge pull request #28930 from Cyberboss/cardboardtubes
...
Fixes cardboard tube duping
2017-07-01 18:14:13 -03:00
19abbab8cd
Merge pull request #28962 from Xhuis/gun_reskin_fix
...
Fixes reskinned guns being invisible
2017-07-01 18:13:20 -03:00
8280b63985
Fixes deathgasping while being cloned ( #28949 )
2017-07-01 18:11:53 -03:00
2eaef38534
Remove sanitize_ooccolor
2017-07-01 17:07:04 +01:00
98508c9236
Merge pull request #28946 from lzimann/holo
...
Changes the holodeck to use tgui, plus some code refactor/improvements
2017-07-01 11:56:57 -04:00
f6ad5996f3
Rethemes the ash walker nest to match the Necropolis ( #28886 )
...
* Rethemes the Necropolis
* clen
* not clever enough, hmm...
* that's a bug. hello, bug.
* no message
* a terrifying Legion room. full of one (1) Legion.
* some tweaks, inside has actual floor type
* tweaks
* Rethemes the ash walker nest to match the necropolis
* fix some issues with the door version
* whoops
* run mapmerge tgm, does not tgm
* whoops
* whoops, all dirs
* tgm
* The bonfire has a grill
* nah just do what ergo wanted
2017-07-01 11:39:31 -03:00
1a118c0651
Merge branch 'master' of https://github.com/tgstation/tgstation into gero_gero
...
# Conflicts:
# icons/effects/96x96.dmi
2017-06-30 21:31:32 -07:00
c51ac78421
More leaper stuff
2017-06-30 21:16:44 -07:00
5ab0992bbb
slightly more huntery
2017-06-30 23:24:01 -04:00
be746c1946
Actually adds the blood-drunk miner ruins
2017-06-30 23:20:16 -04:00
a110e881ad
Adds the blood-drunk miner as a potential mining "mini" boss ( #28829 )
2017-06-30 22:39:49 -03:00
5c5c7b7470
Adds a small recovery window to variable length megafauna attacks for more predictable melee resolution ( #28730 )
2017-06-30 22:38:30 -03:00
fdce8da565
Changes the holodeck to use tgui, plus some code refactor/improvements
2017-06-30 21:27:55 -03:00
4ab451e6ab
More leaper fixes
2017-06-30 17:23:29 -07:00
044fa0ea45
Cleans up godclash code ( #28939 )
...
* Cleans up clash code, adds sound_to_playing_players
* Removes some debug code
* z-level check
* Removes an old thing
* Cyberboss changes
* changes @ maintainer request
2017-06-30 20:03:40 -04:00
24de3629fb
Merge pull request #28941 from optimumtact/bananaphone
...
use_power var now uses a define to reflect it not being a bool
2017-06-30 19:28:30 -04:00
a0e6b52a5c
Port can opening from /vg/ ( #28936 )
...
* Create drinks.dm
* Update drinks.dm
* Delete drinks.dm
* Update drinks.dm
* PORT SOUNDS FROM /vg/
* POP!
* nope
* Update drinks.dm
* Update drinks.dm
* why was attack_self there twice?
* Update drinks.dm
* Update drinks.dm
* GLOB GLOB GLOB
* Update sound.dm
* Update drinks.dm
* Update drinks.dm
* Update drinks.dm
* Update drinks.dm
* Lid is NOT soda specific, right?
2017-06-30 17:19:11 -04:00
e1b0f6328c
Fixes reskinned guns being invisible
2017-06-30 16:05:59 -04:00
d15fc09188
Merge pull request #28932 from MrStonedOne/patch-388
...
Show ban id to banned players
2017-06-30 15:22:43 -04:00
14dc306697
Merge pull request #28928 from MrStonedOne/patch-387
...
Fix the lobby menu not showing when the mysql connection had ghosted
2017-06-30 13:12:29 -04:00
43ca8a63cc
Merge pull request #28924 from ChangelingRain/drakeshadowtweak
...
Tweaks how ash drake shadows look at the beginning and end of swoops
2017-06-30 10:19:38 -04:00
bd28d98c62
Heartbeat fix ( #28916 )
...
* fix
* Update life.dm
* add repeat
* fix
* Update heart.dm
* TRUE
2017-06-30 10:17:31 -04:00
369a6a6fa7
Merge pull request #28920 from tgstation/Cyberboss-patch-2
...
Fix IRC server check
2017-06-30 11:08:06 -03:00
b210c87195
Merge pull request #28918 from tgstation/Cyberboss-patch-1
...
Makes IRC pm use ckey() on target
2017-06-30 00:21:25 -03:00
c1dad51da6
Fixes soil uprooting
2017-06-29 20:56:13 -04:00
ae3740d84b
use_power var now uses a define to reflect it not being a bool
...
NO_POWER_USE
IDLE_POWER_USE
ACTIVE_POWER_USE
holopads now correctly set use_power and the active_power_usage
2017-06-29 23:50:16 +00:00
d7e1eee8e0
Merge pull request #28914 from KorPhaeron/ninja
...
Fixes ninjas not getting their katana
2017-06-29 18:57:32 -04:00
4318caa102
Show ban id to banned players
...
So we can look up what ban is matching and other details like roundid.
2017-06-29 11:22:01 -07:00
917ca588a8
Fixes cardboard tube duping
2017-06-29 14:13:18 -04:00
980089dad6
Holodeck Silicon Check
...
It was possible to emag the holodeck as a non-silicion without an emag.
2017-06-29 13:05:13 -05:00
d48a483353
Merge pull request #28906 from Cruix/ghost_better_alternate_appearances
...
Observers can see through some alternate apperances
2017-06-29 13:38:46 -04:00
55ae89560b
Fix the lobby menu not showing when the mysql connection had ghosted
...
somebody was copypasting boilerplate code.
2017-06-29 08:52:18 -07:00
999282e9d8
Junglestation frog mob take 1
2017-06-29 07:30:18 -07:00
503a20119b
Merge pull request #28892 from nicbn/revert-28577-freezer_heater_fix
...
Revert "Freezers and heaters now drop the correct materials"
2017-06-29 00:54:24 -04:00
048c531952
Merge pull request #28893 from optimumtact/rankup
...
Remove the R_REJUVINATE flag and replace with R_POLL
2017-06-29 00:53:15 -04:00
b1eb2cb8c6
Merge pull request #28894 from optimumtact/erro
...
Do not use your brain, do not look at the code, do not engage me
2017-06-29 00:52:39 -04:00
fecfe42d80
Update wormholes.dm ( #28895 )
2017-06-29 00:50:38 -04:00
875fa3ac61
Fix IRC server check
2017-06-29 00:48:04 -04:00
f820f4a087
Makes IRC pm use ckey() on target
2017-06-28 23:24:59 -04:00
6be19bc4e4
Katana
2017-06-28 19:12:38 -04:00
848690e5b8
Adds heartbeats ( #28858 )
...
* beatz
* use defines
* comments
* start refactor
* refactor 2
* finish refactor
* fix
* Update misc.dm
* Update life.dm
* Update heart.dm
* Update heart.dm
* remove human checks
* move things around
* woops
* wew
* update lowest sound channel
* remove stopsound
* get_turf
2017-06-28 15:01:04 -04:00
5277bf18c9
Fixed ghosts not seeing alternate appearances
2017-06-28 09:06:41 -06:00
3fb988c9c7
Swarmer cleanup
2017-06-28 11:05:49 -04:00
c9d2c2bd8d
Ports bay's supermatter monitor modular program ( #28635 )
...
* WIP
* How the hell did these not get committed
* Fixes, icons for the tablet
* Laptops use the static engine overlay when running the program.
Engineering tablets now start preloaded with a supermatter monitor and alarm monitor.
* Defines
* Requested changes.
Engineering tablets no longer have preinstalled programs.
Supermatter status percents are defines
* Minor thing
2017-06-28 11:05:09 -04:00
ac96764660
Merge pull request #28851 from Cyberboss/RevertBorers
...
Removes cortical borers
2017-06-28 10:33:51 -03:00
bd15d54452
Merge pull request #28868 from AnturK/changeling-monkey-fix
...
Fixes lings losing organs on humanization
2017-06-28 10:31:25 -03:00
f771ea7082
Fixes emergency shuttle endgame state ( #28870 )
2017-06-28 10:30:59 -03:00
e227760e80
Makes virology window larger ( #28866 )
2017-06-28 09:27:55 -04:00
fef015feb0
Do not use your brain, do not look at the code, do not engage me
2017-06-28 02:44:22 +00:00
Leo
MoreRobustThanYou
JamieH
Joan Lung
Ergovisavi
Ashe Higgs
Jordan Brown
Tacolizard
Xhuis
oranges
Kyle Spier-Swenson
GunHog
kevinz000
KorPhaeron
Ian Turk
Shadowlight213
AnturK