Commit Graph

11029 Commits

Author SHA1 Message Date
KorPhaeron
79c2ecc1c9 Thrall fix 2015-09-29 14:37:01 -07:00
Razharas
227f649119 Merge pull request #12017 from KorPhaeron/logging
Logging for communication powers/verbs
2015-09-29 01:45:39 +03:00
Aranclanos
ba07442a69 Merge pull request #12028 from phil235/AddbloodRuntimeFix
Fixes some runtimes, syndiborg module and  grenade launcher
2015-09-28 06:36:54 -03:00
Razharas
f63887d969 Merge pull request #11205 from MrStonedOne/stickybansrus
[Ready]Sticky ban in game interface
2015-09-28 05:51:48 +03:00
Kyle Spier-Swenson
714c460416 Adds missing closing span tags to admin ban bypass notices. 2015-09-27 17:50:18 -07:00
Razharas
50dd1f6b67 Merge pull request #12031 from Xhuis/a_pretty_rad_pr
Radiation changes
2015-09-28 03:24:43 +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
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
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
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
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
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
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
Swag McYolosteinen
caf62582f2 Merge pull request #11980 from AnturK/eventfix
Event Fix
2015-09-24 19:13:22 +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
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
Razharas
f8e2f721c3 Merge pull request #11877 from Core0verload/suicide
Russian roulette: "Spin the chamber" edition.
2015-09-24 01:44:12 +03:00
Razharas
b2e42f518d Merge pull request #11876 from Aranclanos/beaker
Adds a qdel check for when the beaker spills their reagents on the tu…
2015-09-24 01:43:03 +03:00
Razharas
78e9fe068f Merge pull request #11782 from Jordie0608/bagsofholdingsarejustincompletesingularitygrenades
Rework of adv egun failure mechanic
2015-09-24 01:34:38 +03:00
Razharas
3d69d48c18 Merge pull request #11940 from Steelpoint/BiosuitSec
Security Biosuit Sprite/Armour Change
2015-09-24 01:24:31 +03:00
Razharas
d6779855c1 Merge pull request #11946 from Lijah99/ACTUALLYFixesVehicleFootprints
ACTUALLY fixes footprints while in a vehicle/buckled
2015-09-24 01:22:49 +03:00
phil235
c410d1680d Fixes brains sharing their dna with another carbon, which causes runtimes when the carbon and its dna is deleted. 2015-09-23 23:05:26 +02:00
Razharas
e9bed91a1e Merge pull request #11925 from Core0verload/matter-final
Materials - final solution
2015-09-23 21:11:17 +03:00
KorPhaeron
c11edd8418 Butcher update 2015-09-23 12:30:56 -05:00
KorPhaeron
b0a89af2c6 Left a line in the wrong place 2015-09-23 01:16:30 -05:00
KorPhaeron
29e1858fcf New sprites 2015-09-22 23:53:26 -05:00
KorPhaeron
f16b4e1903 Merge remote-tracking branch 'tgstation/master' into toolboxcrusaders 2015-09-22 23:41:02 -05:00
Cheridan
8a71d3e875 Merge pull request #11809 from Xhuis/even_better_than_a_mass_emagger
Uplink rebalance
2015-09-22 23:40:18 -05:00