Commit Graph

1989 Commits

Author SHA1 Message Date
AnturK c4f96685b3 * Sprite fixes 2015-04-16 12:17:55 +02:00
AnturK 1c5c0afc41 * SPRITES! 2015-04-16 12:17:54 +02:00
AnturK bc71b4b8b3 * Fixes observers not seeing abductor hivemind
* Fixes humans without glands getting added to experiment history
* Makes science tool marking more intuitive (Just one click to mark anything now)
* Adds small storage space
* Adds Advanced Baton - Stun,Sleep,Cuff in one tool
* Makes console landmarks search for nearby machine/pad instead of spawning them next to it for mappers
* Fixes only one team spawning
* Fixes roundend report
* Fixes adding more teams to the round
2015-04-16 12:15:41 +02:00
Jordie 4c1a1c8c87 Merge pull request #8967 from phil235/BundleFix1
A big bundle of fixes
2015-04-16 18:18:53 +10:00
Cheridan 87edea4eab Merge pull request #8969 from phil235/BundleFix2
Another bundle of fixes
2015-04-15 21:08:13 -05:00
Swag McYolosteinen 6c1117c14d Merge pull request #8958 from Incoming5643/excuse_me_while_I_vent_a_bit
buffs head slugs a bit
2015-04-15 13:01:58 +02:00
Xhuis 5075909757 More bug fixes 2015-04-14 14:23:30 -04:00
phil235 2ed906b990 Fixes inhand sprites for eggs.
Fixes heart underwear sprite being too big.
Fixes being able to push a janicart through plastic flaps.
Fixes ERT medic closet starting with a combat defib with no cell. Empty combat defib can now get a cell inserted.
Fixes inconsistency in nukeop pinpointer upon activation, it now says standard pinpointer message plus the current mode (shuttle or disk).
2015-04-14 17:41:36 +02:00
phil235 081bae6740 Fixes broken ui action button for toggling chef apron's sleeves and owl's wings.
Fixes surviving suicide
Fixes suicide damage overlays.
Fixes ninja regen "clothes warm" spam message. (moving rad armor check outside of apply_effect)
Fixes ninja smoke bomb count.
Fixes dead shaved corgi
Fixes lipozine still being in code.
Fixes flattening boxes requiring them to have their window opened.
Fixes armor softening message from disarm attack.
Fixes player being forced to play spiders without choosing.
2015-04-14 13:54:36 +02:00
Incoming 68849b9c8e Adds ling control to the head slug
Adds a changelog!
2015-04-13 21:44:54 -04:00
Xhuis 21e8564210 One more define 2015-04-13 21:15:14 -04:00
Xhuis f6c8b3bfc5 Replaces fonts with spans, adds defines 2015-04-13 19:42:50 -04:00
Xhuis f6011468db Removes unnecessary colon 2015-04-13 19:14:05 -04:00
Xhuis 87541dabc2 Progress 2015-04-13 19:12:29 -04:00
Xhuis 7b5760f6d3 Merge remote-tracking branch 'remotes/upstream/master' into shadowling_1 2015-04-13 16:47:00 -04:00
Xhuis 9c752683ef Shadowling update one 2015-04-13 16:46:49 -04:00
AnturK 6fa8e5f02d Adds Abduction Mode 2015-04-13 18:40:15 +02:00
Jordie d780855688 Merge pull request #8908 from Ikarrus/sprayequip
Removes spraycan equipping message and moves their priority down
2015-04-13 18:24:46 +10:00
Jordie 99d545d185 Merge pull request #8891 from Incoming5643/logic_who_needs_that
Fixes a few unreported logic goofs in my newest mulligan pull
2015-04-13 18:24:02 +10:00
Jordie 86f5b381a3 Merge pull request #8884 from Incoming5643/Ooo_whatcha_say
adds speak emote to a lot of simple animals that lacked them
2015-04-13 18:23:51 +10:00
Jordie ae120db87c Merge pull request #8728 from AnturK/action_button
Generic Action\Action Button System
2015-04-13 18:22:08 +10:00
Swag McYolosteinen 8bbad98700 Merge pull request #8920 from Xhuis/raceFix
Fixes being able to spawn with Thrall race (by removing it)
2015-04-12 18:17:40 +02:00
Xhuis 2005e8da66 Fixes Human? in the spawn races tab 2015-04-12 12:15:08 -04:00
Swag McYolosteinen ffd0db2b7b Merge pull request #8581 from MrPerson/lighting_2015
Object based lighting system
2015-04-12 13:14:32 +02:00
Ikarrus 627a47a08b Removes spraycan equipping message and moves their priority down
Spraycans are nice but non-essential in rev and gang. I'd like to remove the message they send to the user when equipped to keep the instructional text concise.

I also moved their priority down so they are spawned and equipped last, just in case the mob doesn't have the room for all of the stuff.
2015-04-11 15:36:48 -06:00
Swag McYolosteinen 853009f7e0 Merge pull request #8157 from Xhuis/shadowling_gamemode
Shadowling (MERGE-READY!!)
2015-04-11 17:51:23 +02:00
Xhuis c9338f7212 Shadowling: RELEASE EDITION 2015-04-11 11:42:02 -04:00
AnturK e2c869bc77 - Adds generic action and action buttons system 2015-04-11 17:06:43 +02:00
Incoming 1ce1b5b67d Fixes a few unreported logic goofs in my newest mulligan pull 2015-04-11 03:41:17 -04:00
Cheridan 2ea63bacc1 Merge pull request #8886 from Xhuis/i_fucked_it_up
Fixes one player requirement for malf (SPEEDMERGE PLOX)
2015-04-10 22:56:18 -05:00
Xhuis deddbfb46b AAAAAAAAAAAAAAAAAAAAAAA 2015-04-10 21:36:46 -04:00
Incoming 81da573b8d adds speak emote to a lot of simple animals that lacked them 2015-04-10 18:44:51 -04:00
Cheridan 076fc321f0 Merge pull request #8859 from Incoming5643/gutcheck_time
Better admin/config control of mulligans + tweaks
2015-04-10 15:19:42 -05:00
Cheridan 898e5e19e5 Merge pull request #8675 from Iamgoofball/patch-50
Juggernaut Balance Option 2: Removes the chemical effects from blobbernauts and buffs their brute damage
2015-04-10 15:06:53 -05:00
Cheridan d04b0a299d Merge pull request #8856 from Incoming5643/death_is_not_my_end
Adds stat checks to all AI malf powers that lack them
2015-04-10 12:37:19 -05:00
Jordie 1736ba7af3 Merge pull request #8130 from Ikarrus/conversiontimeout
Conversions and De-conversions briefly stuns you
2015-04-11 00:50:14 +10:00
Incoming d1892cffbe Organizes the various continuous_round_x config options into one set of config options continuous. Functionality is only there for the same mode that already had that functionality, everything else is continuous always
Makes another set of config options for which rounds types, if any, use the midround antagonist (mulligan) system. Keep in mind this is by definition a subset of round with continuous set. Again this feature is only present for the roundtypes where I KNOW it works properly, other modes can't use midround antags.

The check antagonist screen will show how the game will behave when all the antagonists die, and it can be changed on the fly by admins, the four possible states are:

End on antagonist death (noncontinuous rounds)
Continue if antagonists die (unsupported continuous by default round)
Continue if antagonists die, creating replacement antagonists (continuous, using midround antags)
Continue if antagonists die, not creating new antagonists (continuous, not using midround antags)

When rounds prepare to mulligan admins will additionally get the option to just keep the round going without any automatically created antags in case they want to run their own shinanagans instead. They can also as before choose to end the round.
2015-04-09 16:03:11 -04:00
Incoming 0d8bbb8c14 oh right, canUseTopic basically IS isDead 2015-04-09 14:57:03 -04:00
Incoming 76940f40f7 trims the fat a bit with a tiny tiny proc 2015-04-09 13:34:26 -04:00
Incoming 3017a1362a Adds stat checks to all AI malf powers that lack them, as well as one for buying powers in the first place. Standardizes the message a bit, never mind the pasta, verbs suck like that. 2015-04-09 13:04:33 -04:00
phil235 4ef5aa93dc Merge branch 'master' of https://github.com/tgstation/-tg-station into FoodRecipes2
Conflicts:
	icons/obj/food.dmi
2015-04-09 17:38:14 +02:00
Cheridan 53775cee74 Merge pull request #8775 from Incoming5643/PLEASE_MULLIGAN_WE_CAN_WORK_THROUGH_THIS_I_LOVE_YOU_MAN_PUT_DOWN_THE_GUN
Fixes another instance where the mulligan system just starts screaming at admins instead of doing anything
2015-04-09 00:29:04 -05:00
Ikarrus 49f6888977 I'm just going to throw in a minor change to gang's end-round reporting to make it easier to read the membership report 2015-04-08 21:47:00 -06:00
Ikarrus 246fe2fbd5 Flash conversions do not knock down the target 2015-04-08 21:28:05 -06:00
Ikarrus 09cdd923d8 Merge branch 'master' of https://github.com/tgstation/-tg-station into conversiontimeout 2015-04-08 21:03:54 -06:00
phil235 e6e0143ec5 Merge branch 'master' of https://github.com/tgstation/-tg-station into FoodRecipes2
Conflicts:
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/MiniStation/z2.dmm
	code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
2015-04-08 19:36:49 +02:00
Iamgoofball c06ad7e6b8 moved process() to datum. made /datum/reagents/ process instead of the containers. 2015-04-07 17:13:59 -07:00
Incoming d3c3cb42eb "The Mulligan system, as it exists today, is practically bug free"
-Incoming 4/5/15
2015-04-05 21:08:48 -04:00
Incoming5643 d0144030e0 Good use of commits there Incoming 2015-04-05 20:45:53 -04:00
Incoming 1ee2cbb9ac Fine whatever I don't care
-Tommy Wiseau
2015-04-05 20:41:26 -04:00