Commit Graph

14295 Commits

Author SHA1 Message Date
c0 93251b9870 fuck? FUCK! 2015-09-28 02:34:26 +03:00
Aranclanos 4e90fd62d9 Merge pull request #12030 from phil235/RudimentaryTransFix
Fixes rudimentary transformation bug
2015-09-27 17:54:05 -03:00
Aranclanos d89d29d75f Merge pull request #11969 from tigercat2000/experimentor_stuff
Make EXPERI-Mentor SetTypeReactions() way more efficient
2015-09-27 17:41:42 -03:00
Incoming 067d59669e Makes magic bolts properly unblockable. Their effects still happened even if they were blocked so this really just amounts to removing a false hope message.
Fixes #12046
2015-09-27 15:21:40 -04:00
Remie Richards 131b69474e Merge branch 'master' of https://github.com/tgstation/-tg-station into HandOfGod-Resurgence
Conflicts:
	code/__HELPERS/unsorted.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/modules/client/preferences.dm
	icons/mob/feet.dmi
	icons/mob/head.dmi
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/mob/mob.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/items.dmi
	icons/obj/projectiles.dmi
2015-09-27 17:15:01 +01:00
Remie Richards 58483beb50 Hand of god gamemode!
be_special and antag defines are no longer limited to 16 values (1 - 32768) by being changed from a bitfield to a list, an appropriate block of code exists to automatically update bitfield versions to the new list format. the list format allows us to have (functionally) infinite antag types.
2015-09-27 16:49:56 +01:00
kingofkosmos a3b7625c96 Adds "On Fire" screen alert. Resists when you click it.
Adds a warning-message when you try to help-intent someone who's on fire.
Makes fire spread from burning people who are lying down take 2 seconds if you stand on top of them. Spreading is immediate if you're covered in flammable stuff.
2015-09-27 12:33:26 +03:00
MrStonedOne c45a7c7173 MERGE CONFLICTS, MY ONLY WEAKNESS
How did you know?
2015-09-26 23:42:14 -07:00
MrStonedOne eb8b97cb2b Cleans up isbanned() and stickyban handling
isbanned() cleaned up, it logs sticky ban matches, and better handles admins being exempt from bans
Adminbans now still work once the admin is demoted.
Admins bypassing a ban because they are an admin is logged and announced to all admins including the one who walked past it.
Admins are now exempt from host bans. (this only applies to host bans for ss13, global host bans (where the 'apply to this game only' checkbox is not checked (defaults to not checked)) do not trigger isbanned() and thus, admins can not bypass them, no matter what we do.)

Added a system to queue a message for a client, to be shown next time they connect, this was needed because isbanned() is called before the client is created, so if you want to send a message to an admin, letting them know they just walked pass a matching ban, you have to do it this way.
2015-09-26 23:30:26 -07:00
Tokiko1 cd885e350d Sprites slightly improved to match similar existing clothing sprites.
Removed yellow and green versions to address concerns about these being too common and replacing jumpsuits entirely.
2015-09-27 03:32:29 +02:00
Fox-McCloud 960f0b3129 adds in bluespace trashbag 2015-09-26 18:07:16 -04:00
AnturK ef2ef726ce Fixes Larva/Silicon resizing 2015-09-26 21:01:08 +02:00
Xhuis 5f99b313cc Radiation changes 2015-09-26 13:33:27 -04:00
phil235 4fafc3e542 Fixes rudimentary transformation not using the client's preferences for human bodies. 2015-09-26 18:49:54 +02:00
Razharas 7425b4bb24 Merge branch 'master' of https://github.com/tgstation/-tg-station into SoundProblem 2015-09-26 17:08:09 +03:00
phil235 1d56ff80dc Fixes runtimes with add_blood() and add_blood_list()
Fixes formatting in the mech control console window.
Fixes runtimes when building an AI (mind transfer from mmi to ai was called before the AI's hud_list was set)
Fixes syndicate cyborg not starting with the correct module.
Fixes syndiborg not being able to use their grenade launcher
Fixes runtime with gun process_fire() (some code was reverted by accident)
Fixes a runtime with hostile simple animal's PickTarget().
2015-09-26 13:21:20 +02:00
Fox-McCloud 6ca0a1ad40 Re-Adds Advanced Mop 2015-09-26 06:42:57 -04:00
Razharas b6e4ef88ec Saving the data collecting
Saving the data collecting
2015-09-25 22:52:30 +03:00
Razharas df189498ce The final solution of bad taste in midis question
The final solution of bad taste in midis question
Added special client verb that kills all sounds currently playing for
this client
This is better because toggle midis only pauses them, not actually stops
them
2015-09-25 22:42:24 +03:00
c0 03e1bcfd2b Inert hivelord core is still useful for surgery 2015-09-25 22:37:42 +03:00
c0 feeb9ff7d2 Organs update 3 2015-09-25 22:26:15 +03:00
KorPhaeron 2b5d756a78 Oops 2015-09-25 14:07:39 -05:00
KorPhaeron bfa7119bef Online editor, lets see if it compiles 2015-09-25 14:06:40 -05:00
KorPhaeron b44bad10f6 Logging 2015-09-25 13:04:57 -05:00
KorPhaeron 3011efb59e Additional Logging 2015-09-25 13:00:22 -05:00
Razharas d6b9c50ffd Some minor fixes to firecages pr
Some minor fixes to firecages pr
2015-09-25 17:12:15 +03:00
Razharas 5054411439 Merge branch 'spacevinecontrollerevent' of https://github.com/Firecage/-tg-station into Firecage-spacevinecontrollerevent 2015-09-25 16:48:24 +03:00
c0 a687b07eac f u c k c o n f l i c t s 2015-09-25 14:35:44 +03:00
Aranclanos e4a2745723 Merge pull request #11975 from Iamgoofball/patch-123
Removes very dumb song references from the fox descriptions
2015-09-25 06:03:11 -03:00
KorPhaeron bbd2b1883c Tail sweep 2015-09-24 23:49:47 -05:00
Razharas 0f5917b42d Merge pull request #11889 from Xhuis/fuck_you_thomas_laser
New changeling power; tweaks to fleshmend/last resort
2015-09-25 04:24:38 +03:00
Razharas 7c757a735f Merge pull request #11968 from xxalpha/hot_or_not
Removed /proc/is_hot() && Removed /proc/is_sharp()
2015-09-25 04:02:52 +03:00
KorPhaeron 4e644df7cc Runtime fix 2015-09-24 16:17:37 -05:00
KorPhaeron b1185747bb Fixes 2015-09-24 12:55:54 -05:00
Swag McYolosteinen caf62582f2 Merge pull request #11980 from AnturK/eventfix
Event Fix
2015-09-24 19:13:22 +02:00
AnturK 83354fa364 Fixes 2015-09-24 18:26:12 +02:00
AnturK a99ed56f27 Atom Buckling - Squashed 2015-09-24 16:21:05 +02:00
phil235 94b465399a Merge pull request #11928 from Lijah99/ShadeAttackFix
Fixes shade attack text to be applicable to everything
2015-09-24 14:13:47 +02:00
phil235 f6508e03a1 Merge pull request #11605 from kingofkosmos/aisparksanddeademote
AI damage and dying indicators
2015-09-24 14:11:04 +02:00
Tokiko1 6da0ee911e Adds blue, red, green and yellow female clothing to the ClothesMate. 2015-09-24 13:26:32 +02:00
AnturK 50db063df9 Event Fix 2015-09-24 12:29:25 +02:00
Iamgoofball 6a56d2a1ae Removes very dumb song references from the fox descriptions
how did this make it past the great firewall of meme removal
2015-09-23 20:18:27 -07:00
xxalpha 22474094ae Merge remote-tracking branch 'upstream/master' into hot_or_not
Conflicts:
	code/modules/mob/living/simple_animal/simple_animal.dm
2015-09-24 03:14:04 +01:00
xxalpha 3d15d791fb Merge branch 'edgy' into hot_or_not
Conflicts:
	code/__HELPERS/unsorted.dm
2015-09-24 03:12:08 +01:00
xxalpha deb60ae309 Replaced /proc/is_sharp() with /obj/item/proc/is_sharp(). 2015-09-24 03:08:28 +01:00
Tigercat2000 4766453d88 Make EXPERI-Mentor SetTypeReactions() way more efficient
Thanks, Redbook.

Basically, this used to spawn a shitload of instances and then qdel them;
Just so it could check their icon_state and see if it's not null. However,
spawning so many instances is quite intensive. An undocumented feature
(documented in the redbook, a list of undocumented features); You can
directly access a compile-time variable with just it's path by using
initial().
2015-09-23 17:51:05 -07:00
xxalpha 655b1a77c7 Replaced refactored is_hot() to be an atom proc. 2015-09-24 01:12:38 +01:00
Razharas d3aa84e978 Merge pull request #11937 from KorPhaeron/profligateslikeyoubelongonthecross
Hanging any mob from the kitchen spike
2015-09-24 02:14:06 +03:00
Razharas 1105a2b820 Merge pull request #11899 from kingofkosmos/altclickrotatepipe
Alt-click to rotate stuff
2015-09-24 01:59:04 +03:00
Razharas 4a99082cf6 Merge pull request #11888 from KorPhaeron/toolboxcrusaders
Guardian Changes
2015-09-24 01:46:59 +03:00