Commit Graph

12734 Commits

Author SHA1 Message Date
Remie Richards
eeea775d67 Merge pull request #6188 from tkdrg/miauwpls
Fixes the new AI lawcap config option
2014-12-06 23:55:15 +00:00
Swag McYolosteinen
6f5b2cf7ea Merge pull request #6224 from fleure/gargleblaster
Changes Gargle Blaster description
2014-12-06 10:28:23 +01:00
Razharas
6fb548b283 Merge pull request #6220 from MrPerson/yet_another_attempt_at_fixing_this_shit
Fixes mobs getting moved on the escape pods when buckled
2014-12-06 07:42:12 +03:00
Cheridan
4b9f8972cf Merge pull request #6184 from phil235/PosterRippingSpamFix
Fixes being able to rip posters more than once
2014-12-05 15:13:18 -06:00
Cheridan
d124415c85 Merge pull request #6212 from GunHog/DS_Ninja_Biosuit_Anti-acid
Acid immunity for Biosuits, Ninja, and DeathSquad, and fire protection for DeathSquad
2014-12-05 14:45:53 -06:00
Cheridan
7a13804890 Merge pull request #6191 from phil235/RestrainedTableClimbingFix
Makes table climbing while restrained take twice as long.
2014-12-05 10:35:32 -06:00
Cheridan
3330b991ed Merge pull request #6034 from Jordie0608/whatwerethechancesofthishappening
Makes dice use overlays
2014-12-05 10:15:45 -06:00
Cheridan
f909d59d1a Merge pull request #6130 from phil235/AttackMsgStandardizedFormat
Standardizing attack messages to always show the attacker first
2014-12-04 12:45:31 -06:00
fleure
571e3a4487 Changes Gargle Blaster description 2014-12-04 18:03:50 +00:00
Cheridan
90fc7f3740 Merge pull request #6026 from phil235/BluespaceCrystalVanishFix
Adding sparks, sound and messages when a bluespace crystal is crushed or thrown
2014-12-04 09:32:02 -06:00
MrPerson
47c46844f2 Another buckling fix
Fixes #5730

The ride never ends
2014-12-04 05:42:21 -08:00
GunHog
958e824f37 Acid protection for Biosuits, Ninja, and DeathSquad
- Biosuits, Ninja armor, and Deathsquad armor are now immune to acid.
- Deathsquad armor is now also fireproof!
2014-12-03 22:58:21 -06:00
Menshin
738bfe27a4 Not idea why if(_dmm_preloader) fails to catch nulls... 2014-12-03 20:03:47 +01:00
hornygranny
bc9d9f6d58 Merge pull request #6105 from RemieRichards/AcidProtectionUpdate
Acid protection update
2014-12-03 10:28:47 -08:00
hornygranny
23fd694320 Merge pull request #6127 from phil235/SpanFix1
Fixes span classes and show_message()'s
2014-12-03 10:28:06 -08:00
hornygranny
81061d3f62 Merge pull request #6182 from phil235/AdjustMaskFix
Fixes adjustmask verb for sechailer
2014-12-03 10:27:25 -08:00
phil235
dcb48e3168 Merge branch 'master' of https://github.com/tgstation/-tg-station into SpanFix1
Conflicts:
	code/modules/mob/living/simple_animal/friendly/corgi.dm
2014-12-03 18:59:32 +01:00
Swag McYolosteinen
879f67d834 Merge pull request #6142 from CorruptComputer/dropinacancel
Adds a cancel button to the drop bomb verb
2014-12-03 18:12:45 +01:00
Swag McYolosteinen
1d6a7cf031 Merge pull request #6106 from Razharas/StorageFix
Fix for storages and equip
2014-12-03 17:50:58 +01:00
Swag McYolosteinen
5863d2f5e8 Merge pull request #6075 from Jordie0608/spaceisalivewiththesoundofmidis
Stop Sounds usable by any holder
2014-12-03 17:49:51 +01:00
Swag McYolosteinen
780059bc41 Merge pull request #6093 from optimumtact/patch-2
Add feedback to window construction/deconstruction
2014-12-03 17:48:55 +01:00
Swag McYolosteinen
501ecb1d2a Merge pull request #5945 from JJRcop/get_ghost-fix
Fixes unreported issue with get_ghost
2014-12-03 17:45:07 +01:00
Remie Richards
16506dabc9 Merge pull request #6162 from tkdrg/simplepush
mob/Bump() refactor
2014-12-03 16:43:58 +00:00
Swag McYolosteinen
9618c11a60 Merge pull request #5480 from Perakp/wormholeProjector
Bluespace wormhole projector
2014-12-03 17:42:49 +01:00
Remie Richards
af54024222 Merge pull request #6120 from Menshin/maploader_multiple_tiles_underlaying
[MAPLOADER] Add support for the DMM multiple tiles on one turf underlaying
2014-12-03 16:42:21 +00:00
Remie Richards
8eced8d302 Merge pull request #6134 from Menshin/null_loc_mobs_fix
Prevent some mobs from spawning in nullspace
2014-12-03 16:39:30 +00:00
Remie Richards
88ad308825 Merge pull request #6144 from Menshin/storage_calling_super
Made obj/item/weapon/storage call ..() on New()
2014-12-03 16:38:43 +00:00
Cheridan
4be3b065d9 Merge pull request #6122 from AndroidSFV/fix6097
Fixes #6097
2014-12-02 22:48:01 -06:00
Cheridan
4a4b1c1266 Merge pull request #6169 from phil235/DeathNettleBlendFix
Two fixes for grinder
2014-12-02 22:34:52 -06:00
hornygranny
3388c53838 Merge pull request #6110 from tkdrg/aiaiai
Fixes exploit that lets AIs use machinery even after cameras are disabled
2014-12-02 18:40:28 -08:00
phil235
d840fa74ac Makes table climbing while restrained take twice as long.
Making tablepush and climb_table procs a bit more oop.
Fixes typo in glass table climbing message.
Table-pushing someone is now logged.
Adding a check to table climbing to return if table is destroyed mid-climb
2014-12-02 23:25:36 +01:00
tkdrg
6194c0b90f Fixes the new AI lawcap config option
Previously, it would include null entries in some of the lists, which
meant that the total law amount would be grossly exaggerated.

Fixes #5846
2014-12-02 18:27:06 -03:00
hornygranny
c683849747 Merge pull request #6160 from xxalpha/somethingsomethingreturnnull
Fixes a couple description related issues with fancy storage
2014-12-02 13:13:53 -08:00
phil235
656a533b1a Fixes being able to rip posters more than once by opening multiple confirmation windows beforehand. 2014-12-02 20:44:28 +01:00
phil235
515807ee67 Fixes adjustmask verb for sechailer letting you chose the user mob from a list of all mobs on screen. 2014-12-02 19:25:31 +01:00
hornygranny
9c8f3efdcb Merge pull request #6158 from Razharas/Chems
Proper fix for mechs
2014-12-02 10:19:36 -08:00
Cheridan
e52db34ce3 Merge pull request #6132 from phil235/VirusFix2
Fixes some incurable diseases
2014-12-02 08:18:04 -06:00
Razharas
0b5ae9899e Merge pull request #6125 from MrPerson/span_classes_never_heard_of_them
Removes a stray /red in robot_upgrades.dm
2014-12-02 15:54:17 +03:00
phil235
47762bf960 Fixes being able to click the grinder buttons while it's operating (ejecting beaker before grinding is finished), the grinder window is now correctly updated.
Fixes death nettle not producing pacid upon grinding, fixes novaflower not producing condensedcapsaicin (one of its reagents) upon grinding.
Renaming "inuse" var to "operating" to avoid confusion with "in_use" var
2014-12-01 16:57:07 +01:00
Razharas
b9b73531a6 Merge pull request #6104 from tkdrg/bouncy
Stops the field from bouncing the sing around
2014-12-01 18:14:12 +03:00
Razharas
a08c7a0856 Merge pull request #6117 from Intigracy/you'renotverybright
Sanitizes OOC color editing
2014-12-01 17:51:31 +03:00
tkdrg
74d73b29aa mob/Bump() refactor. OOPing and general cleanup.
Removes copy-paste. Creates three new mob/living procs.
ObjBump, MobBump and PushAM which are called by mob/living/Bump().
Removes a ton of copy-paste and needless code.
Also fixes simple_animal Bump() on harm intent.
Previously, they'd move twice.
Fixes #3550
2014-11-30 22:51:17 -03:00
xxalpha
260ee75c9a Fixes several description related issues with fancy storage 2014-11-30 22:03:25 +00:00
Orange Borg
97f10f6812 Add feedback to window construction/deconstruction
Users didn't get any feedback when the process started
2014-12-01 10:36:26 +13:00
Razharas
6eba69ab28 And this too 2014-12-01 00:24:49 +03:00
Razharas
14d0d166f3 Merge branch 'master' of https://github.com/tgstation/-tg-station into Chems 2014-12-01 00:13:13 +03:00
Razharas
c2046105af Ok reverting this shit
Disregard this you know what i do
2014-12-01 00:12:58 +03:00
Razharas
c8817469fc Merge pull request #6124 from MrPerson/eye_lmao
Redo cyborg icon updating
2014-11-30 22:46:37 +03:00
Menshin
efb50e374a Made obj/item/weapon/storage call ..() on New() 2014-11-30 03:14:49 +01:00
Menshin
8552a606f9 Minor optimization 2014-11-30 03:11:55 +01:00