Commit Graph

14295 Commits

Author SHA1 Message Date
Jordie0608 00123edb18 double whoops 2015-09-03 20:45:24 +10:00
Jordie0608 4e4324d9ce whoops 2015-09-03 20:44:39 +10:00
Jordie0608 9de0f3567d config announce admin login/out 2015-09-03 20:38:36 +10:00
bgobandit ca34015b85 Removes minibomb suicide message. Fixes wand suicide message. 2015-09-02 23:07:40 -04:00
Aranclanos d2903d077f Merge pull request #11530 from xxalpha/coilcablecorrection
Fixed a couple of bugs with cable coils.
2015-09-02 22:55:47 -03:00
bgobandit 77405d49b0 Tweaks numbers upward. 2015-09-02 14:15:42 -04:00
Razharas 93077ab2e3 Merge branch 'master' of https://github.com/tgstation/-tg-station 2015-09-02 19:04:16 +03:00
Razharas feb3d2adce Fixes comment
Fixes comment
2015-09-02 14:41:27 +03:00
Razharas c2d3998e82 Merge pull request #11217 from Ergovisavi/fire_in_the_disco
Small changes to mobs on fire
2015-09-02 14:38:20 +03:00
Razharas e0e5bbc978 Merge branch 'DSStuff' of git://github.com/Steelpoint/-tg-station into Steelpoint-DSStuff 2015-09-02 14:38:07 +03:00
xxalpha 4e7d0c6ed5 Fixed wizard slaughterdmssmsmsms
asdasdasd
2015-09-02 10:47:37 +01:00
Razharas 92172265e3 Merge pull request #11396 from RemieRichards/DataStructures-Stacks&LinkedLists
Datastructures: Stacks & Linked Lists
2015-09-02 10:34:19 +03:00
Ergovisavi bf69c85f71 Mobs on fire adjustments:
-You heat up faster based on fire stacks
-Reduced the amount of fire stacks you lose over time per tick
-Increased the damage you take while on fire at the highest temperature point
-Increased the amount of fire stacks you get from hotspots
2015-09-01 22:04:10 -07:00
duncathan 381139422c Merge branch 'master' of https://github.com/tgstation/-tg-station into pipecleanup
Conflicts:
	_maps/map_files/MiniStation/MiniStation.dmm
	code/ATMOSPHERICS/atmospherics.dm
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/ATMOSPHERICS/components/components_base.dm
	code/ATMOSPHERICS/components/unary_devices/cryo.dm
	code/ATMOSPHERICS/components/unary_devices/vent_pump.dm
	code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
	code/ATMOSPHERICS/pipes/manifold.dm
	code/ATMOSPHERICS/pipes/manifold4w.dm
	code/ATMOSPHERICS/pipes/simple.dm
	code/_compile_options.dm
	code/controllers/subsystem/garbage.dm
	code/game/machinery/bots/mulebot.dm
	code/modules/mob/living/carbon/alien/say.dm
	code/modules/mob/living/simple_animal/bot_swarm/swarmer.dm
	html/changelogs/.all_changelog.yml
2015-09-01 20:29:00 -06:00
Remie Richards c560841438 Moves bloody footprint code out of step_action() and into human/Move() 2015-09-02 01:48:20 +01:00
Remie Richards ff07337841 Bloody footprints! Human blood, Xeno blood, and Oil can now produce bloody footprints that fade off as the blood on the shoe fades. Affects gibs too. 2015-09-02 01:32:02 +01:00
xxalpha 4ead972306 Drying agent. Recolor dry shoes
use define
2015-09-01 22:59:30 +01:00
xxalpha 70d97ad5e4 Fixed a couple of bugs with cable coils. 2015-09-01 22:35:04 +01:00
Aranclanos 7daee1797b Fixes the latejoin message about the evacuation shuttle showing on incorrect times. 2015-09-01 15:38:56 -03:00
xxalpha 7cc6070a13 Absorbent galoshes. 2015-09-01 17:08:59 +01:00
Razharas 93ca749785 Merge pull request #11478 from xxalpha/crawlinginmyskin
Changed blood crawl to be a spell.
2015-09-01 18:36:20 +03:00
Aranclanos 87971f36c9 Merge pull request #11484 from spasticVerbalizer/swarmEmptyMessage
Adds check for empty message in guardian communicate verbs
2015-09-01 12:27:26 -03:00
Aranclanos 7d729e270b Merge pull request #11508 from Core0verload/spider
Removes unused SpiderOS icons
2015-09-01 12:25:56 -03:00
Razharas 737ee58330 Merge pull request #10830 from xxalpha/HACKERS
Made it possible to emag a cyborg more than once.
2015-09-01 17:58:53 +03:00
xxalpha a5062c812b Added emag cooldown. Added emag protection if cyborg slaved to tator AI. 2015-09-01 15:53:12 +01:00
xxalpha 75b2f53ce8 Merge remote-tracking branch 'upstream/master' into crawlinginmyskin
Conflicts:
	icons/mob/actions.dmi
2015-09-01 15:39:15 +01:00
Razharas c94085dcbe Merge pull request #11489 from Core0verload/turbine
Fixes roundstart turbine spawning broken
2015-09-01 17:39:03 +03:00
Razharas 72610973cc Merge pull request #11427 from xxalpha/magborg
Gave engineering cyborgs permanent magboots effect.
2015-09-01 17:31:15 +03:00
Razharas 9d6ce85e9a Merge pull request #11414 from Xhuis/shadowling_update_4
Shadowling Update IV
2015-09-01 17:19:07 +03:00
Razharas 6724e65aae Merge pull request #11270 from ExcessiveUseOfCobblestone/master
Simple RnD tweaks
2015-09-01 16:40:25 +03:00
Razharas 1582526447 Merge pull request #11166 from GunHog/Sawumakesmewanttocry
E.X.P.E.R.I-MENTOR fixes
2015-09-01 16:06:58 +03:00
xxalpha 642406e6c9 Merge remote-tracking branch 'upstream/master' into HACKERS 2015-09-01 14:05:35 +01:00
Razharas a1e74cb22d Merge pull request #11334 from oisin100/patch-2
Realistic Trees
2015-09-01 16:00:13 +03:00
Razharas 37556b1c1f Merge pull request #11491 from Aranclanos/ghostyelling
Fixes ghost yelling, now the message will be displayed.
2015-09-01 15:56:29 +03:00
Razharas bfbe4e997e Merge pull request #11505 from duncathan/returnQDEL_HINT_LETMEDIE
Makes all Destroy() procs return properly
2015-09-01 15:54:18 +03:00
Razharas 752454e239 Merge pull request #11509 from Aranclanos/playerplanel
Fixes the player panel not opening on clientless mobs
2015-09-01 15:49:42 +03:00
Razharas e69d8d312b Merge pull request #11232 from Miauw62/alanedaggerpoe
Edaggers: Actually works edition
2015-09-01 11:07:22 +03:00
Razharas 829a88816b Merge pull request #11179 from Dorsisdwarf/andtheyrelikeitsdeaderthanyours
Makes lings undetectable to the AI when using digital camo
2015-09-01 11:00:38 +03:00
Razharas 8a6b41865e Merge pull request #10873 from ghost/chameleon
Chameleon Eyewear
2015-09-01 10:51:15 +03:00
Razharas 446e784017 Merge pull request #11318 from kingofkosmos/borgdedcoverunlock_aidedunanchor
Cyborgs unlocking cover and AI unanchoring upon dying.
2015-09-01 10:08:08 +03:00
Razharas 087758925f Merge pull request #11336 from Aranclanos/IactuallyHateThem
Adds a happy greeting for my friends the admins who I love!
2015-09-01 10:07:31 +03:00
Razharas 610905bb55 Merge pull request #11342 from Fox-McCloud/emitterboard
Producible Emitter Boards at R&D
2015-09-01 10:06:03 +03:00
Razharas 8cbfed09a5 Merge pull request #11346 from bgobandit/newsurgerytweaks
New Ghetto Surgery Items: Non-Fucked Up Edition
2015-09-01 10:04:25 +03:00
Razharas cddb32f606 Merge pull request #11384 from Aranclanos/petemilking
Fixes goat and cow milking, they were just simply not working.
2015-09-01 10:02:27 +03:00
Razharas 3bf36ad9a6 Merge pull request #11475 from MrStonedOne/patch-33
Changes gold slimes mob list to use initial() and only generate the mob list once.
2015-09-01 09:54:31 +03:00
Razharas 40bdd7e1eb Merge pull request #11488 from bgobandit/smeslogging
Adds fingerprint transfer for machine deconstruction; logs SMES
2015-09-01 09:50:57 +03:00
duncathan 48b67e5a25 Merge branch 'master' of https://github.com/tgstation/-tg-station into returnQDEL_HINT_LETMEDIE
Conflicts:
	code/game/objects/effects/landmarks.dm
2015-09-01 00:11:33 -06:00
ExcessiveUseOfCobblestone d85cae38bb Moved to Auto 2015-08-31 15:56:42 -04:00
ExcessiveUseOfCobblestone 5dee17a846 Merge remote-tracking branch 'tgstation/master' 2015-08-31 15:54:06 -04:00
bgobandit d23f2cb622 mats for toolboxes, glasses and flashes; adjusts coin amounts up slightly 2015-08-31 12:14:34 -04:00