Commit Graph

8997 Commits

Author SHA1 Message Date
Swag McYolosteinen
fecf02c3ea Merge pull request #8842 from Xhuis/wraith_miniantag
Revenant: A Mini-Antagonist
2015-04-18 10:47:59 +02:00
Iamgoofball
7fa33e5b50 Removes chem piles due to exploit.
I'd fix it in the black powder files but @phil235 has them on hold.

Merge ASAP
2015-04-17 16:58:19 -07:00
Xhuis
a9439151ac Fixed some more issues 2015-04-17 18:06:27 -04:00
Xhuis
6474bb498b Fixes two oversights 2015-04-17 17:29:30 -04:00
Xhuis
2378aa6b65 More progress 2015-04-17 17:26:30 -04:00
Cheridan
123e490994 Merge pull request #8936 from Jordie0608/tfwyoubreakyourownfix
Merges secure closet code into normal closets, fixes overlay bugs
2015-04-17 15:43:40 -05:00
Cheridan
fe22031276 Merge pull request #9011 from MrPerson/rods_are_finite_once_again
Fixes infinite rod via disposals duplication
2015-04-17 13:51:25 -05:00
Remie Richards
b08aaa7b63 Merge pull request #8985 from AnturK/camera
Adds Advanced Camera Console
2015-04-17 17:15:04 +01:00
Cheridan
8b2175b5e9 Merge pull request #8989 from MrStonedOne/patch-8
Removes admin notices on failed logins in isbanned
2015-04-17 09:37:07 -05:00
Cheridan
d6741236b5 Merge pull request #8991 from Fayrik/AllTheSmallThings
One-Click-Antag Tweaks: Now with more jobbans!
2015-04-17 09:30:08 -05:00
Jordie0608
26ca19e07d Merge branch 'master' of https://github.com/tgstation/-tg-station into tfwyoubreakyourownfix
Conflicts:
	code/modules/mining/mine_items.dm
2015-04-17 18:02:45 +10:00
phil235
6807b1ae48 Merge branch 'master' of https://github.com/tgstation/-tg-station into AlienNestPixelFix
Conflicts:
	code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
2015-04-16 23:44:12 +02:00
MrPerson
5fd9116d0c Fixes infinite rod via disposals duplication
Fixes #9007
Sadly they still generate a set of rods but at least they only do it once.
2015-04-16 09:25:03 -07: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
Fayrik
f6983f22e4 Age check works with any type of game mode, and nuke teams report failure if there aren't any candidates at all. 2015-04-16 10:13:48 +01:00
Jordie
c4b0821090 Merge pull request #8983 from MrStonedOne/patch-7
Removes resting from ghost verb
2015-04-16 18:19:28 +10:00
Jordie
c46bac3721 Merge pull request #8982 from MrPerson/fun_fact_you_can_currently_attack_light_with_a_toolbox
Makes light objects not appear via alt-click
2015-04-16 18:19:18 +10:00
Jordie
15a9d37d4e Merge pull request #8975 from MrStonedOne/patch-6
Fixes href exploit relating to admins without +fun being able to force events
2015-04-16 18:19:07 +10:00
Jordie
4c1a1c8c87 Merge pull request #8967 from phil235/BundleFix1
A big bundle of fixes
2015-04-16 18:18:53 +10:00
Xhuis
344dff4416 Revenants 2015-04-15 22:55:27 -04:00
Fayrik
772b05d56b New Jobbans, and proper messages for when you fail to spawn antags. 2015-04-15 20:27:44 +01:00
MrStonedOne
eb6279a5a4 Removes admin notices on failed logins in isbanned
This could be used to spam admins, without them having any way to stop it, and as tobba has informed me, isbanned() is called before byond does much validation on the data (like checking that the claimed username exist or validating that they own it), leaving these notices vulnerable to html injection
2015-04-15 10:11:37 -07:00
AnturK
32c038a0e1 * Changed to remote_control 2015-04-15 17:04:52 +02:00
Cheridan
a9002da949 Merge pull request #8776 from Xhuis/its_time_for_slimeperson_on_slimeperson_action
Adds an additional effect to green slime cores
2015-04-15 08:53:55 -05:00
Cheridan
4468cf7bc5 Merge pull request #8935 from Incoming5643/deep_fried_lizards
Extra mutantrace parts won't hold color if the body gets husked
2015-04-15 08:29:26 -05:00
AnturK
5b8d5446f5 Adds Advanced Camera Console 2015-04-15 13:45:07 +02:00
Swag McYolosteinen
7c36795db3 Merge pull request #8970 from phil235/WingFixChu
Fixes wingfangchu recipe.
2015-04-15 13:03:58 +02:00
Swag McYolosteinen
5e6cbd57cd Merge pull request #8916 from Iamgoofball/patch-55
Fixes and changes Napalm Recipe
2015-04-15 13:03:14 +02: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
Swag McYolosteinen
baf3c06171 Merge pull request #8957 from MrStonedOne/I-spent-five-minutes-trying-to-think-up-a-branch-name-and-all-I-got-was-this-lousy-excuse-of-one
Admins can now drag ghosts to mobs to put that ghost in control of that mob
2015-04-15 12:24:13 +02:00
MrStonedOne
2227b7adb3 Adds some sanity checks to admin ghost drag. 2015-04-15 02:58:54 -07:00
MrStonedOne
f1943945e2 Removes resting from ghost verb
This caused issues with mobs like borgs and simple mobs where they would be unable to move if admins put another ckey in the mob after they ghosted but there would be no clear indication as to why they couldn't move and in some cases, no way to un-rest without further admin intervention.
2015-04-14 23:50:06 -07:00
MrPerson
58a1f12103 Makes light objects not appear via alt-click
Fixes #8954
2015-04-14 20:59:52 -07:00
Cheridan
26a974a8c3 Merge pull request #8943 from MrPerson/ied_fixes
IED fixes
2015-04-14 19:40:50 -05:00
Cheridan
63b590d1c8 Merge pull request #8950 from Incoming5643/malfunction_junction_whats_your_major_malfunction
Fixes malf powers being broken
2015-04-14 17:22:31 -05:00
Cheridan
bf6ae43aec Merge pull request #8917 from phil235/BorgDrillFix
Fixes miner cyborg being able to eject their drill's cell.
2015-04-14 17:19:27 -05:00
phil235
de8080f7b2 Merge pull request #8927 from Xhuis/shadowlingUpdateOne
Shadowling Update I
2015-04-14 21:22:46 +02:00
phil235
a584b8df0e woops 2015-04-14 20:30:02 +02:00
MrStonedOne
d9a9ae1358 adds a permission check to force event's topic
There existed a href exploit that allowed any admin to force an event.
2015-04-14 10:48:24 -07:00
phil235
882ab28794 derp, wrong PR. 2015-04-14 19:09:57 +02:00
phil235
c39168b059 Fixes wingfangchu recipe. It is now a soup (consistent with its sprite) 2015-04-14 18:44:55 +02:00
MrStonedOne
e1338fed2b fixes a minor mishap with ghostize in admin ghost drops 2015-04-14 07:21:23 -07:00
MrStonedOne
f2e2940255 Makes admin ghost drag use ghostize 2015-04-14 06:01:42 -07:00
phil235
0f6a60600d Fixes alien nest overlay appearing above standing mobs. Also fixes lying mobs appearing in front of standing mobs.
Fixes alien humanoid custom pixel shift being reset by life(). Refactors how pixel reinitialisation (when standing or lying or during animations) is done. Adding get_standard_pixel_y_offset() proc (and same for x), removing lying_pixel_y_offset var from all mobs, adding custom_pixel_x_offset (and y) so Wjohnston can play with his aliens.
2015-04-14 14:55:05 +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
507084a0c2 conflicting with myself 2015-04-13 21:01:25 -04:00
Incoming
d10454e810 buffs head slugs a bit:
Head slugs can now vent crawl (they're so tiny why didn't they already have this?)
Head slugs can stumble around for 10 seconds after they lay their egg so they don't die super obviously right next to their infected corpse
2015-04-13 20:56:54 -04:00
MrStonedOne
39decb8bf6 Admins can now drag ghosts to mobs to put that ghost in control of that mob.
This functions the same way as editing the ckey in vv, and has the same permission checks
It requires the admin also be a ghost to avoid conflicts with other drag drop code.
2015-04-13 17:33:04 -07:00
Xhuis
87541dabc2 Progress 2015-04-13 19:12:29 -04:00
Incoming
68eb02adbd Fixes malf powers being broken because canusetopic was never a thing for AIs before this point 2015-04-13 17:40:28 -04:00