Commit Graph

3862 Commits

Author SHA1 Message Date
Cheridan d529235696 Merge pull request #6187 from phil235/GrilleWindowFix
Fixes being able to place multiple fulltile window on a grille.
2014-12-09 12:51:05 -06:00
Razharas 0b32dc97a7 Merge pull request #6136 from optimumtact/patch-3
Grille throwforce is now halved against grilles, instead of -5
2014-12-09 05:31:32 +03:00
Swag McYolosteinen b828448645 Merge pull request #6228 from paprka/coatscoats
Adds winter coats and changes labcoat toggling
2014-12-08 11:35:56 +01:00
Swag McYolosteinen bff2e62a0f Merge pull request #6175 from Razharas/ExActFix
Fixes ex_act() destroying too much shit
2014-12-08 08:03:35 +01:00
paprka bf207efa9a santa hats for sec and sprite tweak 2014-12-07 20:22:54 -08:00
paprka c158599253 Christmas santa hats! 2014-12-07 20:02:03 -08:00
paprka 89c1469b06 updates metastation for winter coats, tweaks spawning, tweaks santa hat 2014-12-06 23:00:34 -08:00
Remie Richards 9368500614 Merge pull request #6208 from tkdrg/wooh
Fixes ausbushes icon_state for the subclasses
2014-12-06 23:56:51 +00:00
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
Razharas cd218a7ba3 Proper handling of computers and tables by c4
Proper handling of computers and tables by c4
2014-12-06 21:44:52 +03:00
paprka 0f3f0659d1 coats to lockers, winter boots 2014-12-05 21:14:49 -08: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
Razharas 7758a0afed Ok now explosions shall work properly
Changed severity to target, make items not destroy themselves on
severity lower than 1, all that stuff
2014-12-05 23:21:48 +03:00
Razharas 6ce052f45a Merge branch 'master' of https://github.com/tgstation/-tg-station into ExActFix 2014-12-05 20:45:27 +03: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
paprka 9e9b8b440d adds winter coats and changes labcoat toggling 2014-12-04 21:29:21 -08: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
tkdrg 94520e04e0 Fixes ausbushes icon_state for the subclasses 2014-12-03 21:34:02 -03:00
hornygranny bc9d9f6d58 Merge pull request #6105 from RemieRichards/AcidProtectionUpdate
Acid protection update
2014-12-03 10:28:47 -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 1d6a7cf031 Merge pull request #6106 from Razharas/StorageFix
Fix for storages and equip
2014-12-03 17:50:58 +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 9618c11a60 Merge pull request #5480 from Perakp/wormholeProjector
Bluespace wormhole projector
2014-12-03 17:42:49 +01: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
Razharas 6c6257daf6 No more fire inside walls
No more fire inside walls
2014-12-03 17:17:24 +03: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 3160ac56b1 Fixes being able to place multiple fulltile window on a grille.
Fixes being able to place a fulltile window on a grille with single dir windows.
Fixes a typo in grille message.
Grille now needs to be anchored to place a window on it.
2014-12-02 22:00:25 +01: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
Razharas f4f3768d70 Fixes ex_act() destroying too much shit
Borg modules are safe
So are items with bomb protection
Items in people who wear bomb-protective gear are safe too
2014-12-02 18:30:56 +03: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
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
Orange Borg 7015cb3f8d Remove the -5 throwforce against grilles, replaces with * 0.5
As per dicusssion on #6092 which Raz merged before I could add the change.

Max left in as a guard against -forces magically healing the grille.
2014-12-01 10:00:55 +13: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
Perakp 48b1ee513e Merge remote-tracking branch 'upstream/master' into wormholeProjector
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2014-11-29 09:37:40 +02:00
hornygranny 9ea01e3e44 Merge pull request #6107 from tkdrg/runtimesfuntimes
Fixes pacid chem grenade runtime
2014-11-28 16:35:01 -08:00
hornygranny e7d862b248 Merge pull request #6119 from Intigracy/recursivebyebye
Removes recursive explosions
2014-11-28 16:33:30 -08:00
Razharas da35b4dadc Merge pull request #6115 from CorruptComputer/pdashitstorm
Added a cancel button to the PDA
2014-11-28 20:52:38 +03:00
phil235 22e0771eb9 Fixes more span classes. Replaces some "for() show_message()" with "visible_message()". Adding a suicide message for slimes. Fixes simple_animal/corgi having two attackby procs. 2014-11-28 16:08:59 +01:00
Razharas b3f79777c9 Merge pull request #6092 from optimumtact/patch-1
Stop items having a negative throw force against grilles
2014-11-28 15:16:59 +03:00
Razharas 9e0d8c6ef6 Merge pull request #6094 from tkdrg/cuffmsg
Adds some feedback messages for handcuffing
2014-11-28 15:13:36 +03:00
MrPerson 62e9f21382 Removes a stray \red in robot_upgrades.dm 2014-11-27 23:21:35 -08:00
MrPerson 89030ad3f7 Redo cyborg icon updating
Removed the stupid "updateicon()" proc and placed the behavior in update_icons() and regenerate_icons()
Removed redundant update_fire() calls
Fixes #6057 since the staff calls regenerate_icons()
2014-11-27 23:04:35 -08:00
Intigracy 8a1baad03b forgot the var / proc 2014-11-27 14:50:21 -08:00
Intigracy 31835f1987 Removes the unused explosion_recursive.dm and everything related to it, including the configuration option. 2014-11-27 14:28:20 -08:00
hornygranny b573a00f5e Merge pull request #5918 from Razharas/Cfour
Who am i kidding, its explosions rework for a long time already
2014-11-27 13:58:56 -08:00