ca917c828f
Staff of animated statue fixes and nerfs
...
Player controlled animated statues that ghost won't start attacking everyone, they'll just stalk people without attacking.
A player controlled animated statue will only last as long as the statue would have lasted,at the end of the time the player is released from the statue as usual, and no longer has any onus to not fuck up the wizard.
NOTE: this means you can't use animate statues to "kill" a target, they'll recover eventually, and even if the round ends before they do, it still won't count.
2014-03-01 23:12:30 -05:00
ff08e7c557
Merge pull request #2893 from Miauw62/gurehibjkogtirfhdgyf(ihgufhygdfrgjihkigfjuhygdfhijgufhygdhufrg
...
Fixed more NODROP runtimes
2014-02-24 13:43:33 -06:00
b64ba5ba1e
Merge pull request #2887 from Giacom/statue_fixes
...
Silicons no longer stop statues from being able to move.
2014-02-24 14:59:00 -02:00
0a8e8a6b3e
Merge pull request #2843 from MrPerson/its_a_beeeeeeeeeeeeaaaaaaaarrrr!!!!!
...
Standardized space bears.
2014-02-24 08:07:48 -08:00
3d90e8815e
Merge pull request #2827 from Ergovisavi/muh_vision
...
Adding NVG's/Advanced Mesons to the protolathe, some human vision changes
2014-02-24 07:55:34 -08:00
f75692ceed
Fixed more NODROP runtimes
2014-02-23 19:34:49 +01:00
2a7f688d90
Fixes a NODROP runtime.
2014-02-23 19:20:27 +01:00
e6c856e456
Merge pull request #2803 from Rockdtben/SyndCardDesc
...
Synd card desc
2014-02-23 13:46:10 -02:00
916e7c9ec3
Silicons no longer stop statues from being able to move.
...
Added a variable that will allow you to have the statues move while seen.
2014-02-22 22:22:02 +00:00
b723f68979
Merge pull request #2868 from Aranclanos/StopThinkingBrain
...
Stops brains generating runtimes by toggling throw mode
2014-02-22 12:58:36 -06:00
8af22aeeac
Merge pull request #2861 from hornygranny/muhspans
...
Fixes #2726 , #2729
2014-02-21 20:39:58 -06:00
2a8e2c5009
Stops brains generating runtimes by toggling throw mode
2014-02-21 08:52:05 -03:00
94a5e4e04e
Merge pull request #2846 from Miauw62/kagipjadgipgj
...
Fixes an unequip runtime
2014-02-20 23:54:52 -02:00
031515bd85
made slime shock messaged more gudlier
2014-02-20 14:56:10 -08:00
ed12a9cfb0
missing exclamation points
2014-02-20 12:41:23 -08:00
a86de57c05
Fixes #2726
2014-02-20 12:11:00 -08:00
e38a012697
Merge pull request #2840 from Aranclanos/hatsaway
...
removes the chance of your hat flying off
2014-02-20 10:11:43 +00:00
807590e4d3
Fixes an unequip runtime
2014-02-19 21:04:50 +01:00
5cf93a55ea
Merge pull request #2804 from Perakp/borgAnimations
...
Animated cyborg transformations
2014-02-19 19:02:34 +00:00
5a3ad8c138
Standardized space bears.
...
Removed a bunch of special space bear behavior to make them like other simple_animals. Fixes #272
2014-02-19 10:10:41 -08:00
19e4407e0d
removes the chance of your hat flying off
2014-02-19 07:00:14 -03:00
bf6f9d3786
If this works I'll be very happy
...
I think I’ll try to merge these commits later.
2014-02-19 00:42:15 +02:00
9f43935f89
Trying to fix mob.dm merge conflicts
...
I’ll do this over and over again until it works
2014-02-19 00:28:22 +02:00
965e7ad6d8
Merge to master
...
Conflicts in mob.dm
2014-02-18 23:59:59 +02:00
fe9a5b0513
DONT PANIC DONT PANIC DONT PANIC
2014-02-18 18:50:32 +01:00
9d74d4c840
i save the fucking day and replace a single u_equip into unEquip
2014-02-18 18:23:37 +01:00
3b24bb64f4
Merge branch 'master' of https://github.com/tgstation/-tg-station into NODROP
...
Conflicts:
code/modules/mob/transform_procs.dm
2014-02-18 18:22:40 +01:00
62ab59b128
Changed the typepath of HUD sunglasses to be a child of the security hud
...
Removed all the istype checks for glasses in humans
Added advanced mesons (Old meson functionality of removing darkness overlay) and NVG's to the protolathe
2014-02-17 21:00:46 -08:00
ea7318985d
Merge pull request #2714 from Ergovisavi/asteroid_overhaul
...
[MAP] Asteroid/Mining Overhaul
2014-02-17 16:44:46 -08:00
b78c7eca06
Merge pull request #2809 from hornygranny/throwspeed
...
throwspeed pass
2014-02-17 06:26:06 -02:00
1749d38d56
Merge branch 'master' of https://github.com/tgstation/-tg-station into asteroid_overhaul
...
Fixed possible runtime issue with Jaunters, fixed merge issues, changed mining points to examine from attack self
2014-02-16 19:36:48 -08:00
b198ea5c9a
Merge pull request #2795 from AnturK/machinegunqueen
...
Fix for neurotox machine gun queens
2014-02-16 08:45:16 -08:00
be73e9d09f
Merge pull request #2771 from fleure/eggs
...
Increased egg hatch rate and reduced chicks in crate
2014-02-16 08:37:49 -08:00
b48efdaed0
Merge pull request #2761 from Incoming5643/blobjob
...
Blobize edge case fix
2014-02-16 08:28:46 -08:00
30d5da6205
Merge pull request #2769 from Aranclanos/handcuffedhands
...
you can't give items to people handcuffed.
2014-02-16 14:26:52 +00:00
9d3f8f6a2d
second pass
2014-02-15 20:11:12 -08:00
9e14c22747
Reduces throwspeeds on all items to realistic levels.
2014-02-15 19:58:03 -08:00
68ad6f352f
Merge pull request #2768 from Rockdtben/removeUnusedRadarVar
...
Removed two unused variables.
2014-02-15 19:13:13 -08:00
b9aa674ac5
- You don't need to hide the mob when showing an animation of it changing.
2014-02-15 23:18:09 +02:00
befbec249e
- Adds Iatot's animations from standard cyborg to other cyborg modules.
...
- Toiletbot (Service borg Kent) not included.
- Renamed some cyborg sprites in robots.dmi so they make more sense/ are easier to work with.
2014-02-15 20:58:11 +02:00
455175c42e
Meh looks like I Forgot to revert.
2014-02-15 10:50:22 -06:00
3f9bf15ca5
Merge branch 'master' of https://github.com/tgstation/-tg-station into NODROP
...
Conflicts:
code/modules/mob/mob.dm
2014-02-15 17:30:21 +01:00
7354305c80
ALRIGHT WE'RE DONE NOW FOR REAL THIS TIME
2014-02-15 17:06:25 +01:00
831f23f820
now it's finished entirely \o/
2014-02-15 16:56:12 +01:00
cf2d12771f
Fix for neurotox machine gun queens
2014-02-15 00:51:33 +01:00
7e324bb17c
- Still fixing merge conflicts
...
- Giving spells to mobs without minds should work
2014-02-14 21:32:16 +02:00
9a27f7d39b
Merge remote-tracking branch 'origin/spellsFromBodyToMind' into spellsFromBodyToMind
...
Conflicts (Resolved):
code/game/gamemodes/wizard/artefact.dm
config/admins.txt
2014-02-14 21:00:10 +02:00
7ca06565b5
Merge remote-tracking branch 'upstream/master' into spellsFromBodyToMind
...
Conflicts (Resolved):
code/datums/spells/mind_transfer.dm
code/game/gamemodes/wizard/artefact.dm
code/modules/mob/mob.dm
code/modules/projectiles/projectile/change.dm
2014-02-14 20:57:11 +02:00
e0d0cedf36
passed over everything with throwforce
2014-02-13 18:06:50 -08:00
0ffbc6bad2
Merge pull request #2758 from hornygranny/monkeynecromancy
...
Fixes #2383
2014-02-13 17:21:39 -06:00
Incoming
Cheridan
Aranclanos
Razharas
Miauw
Giacomand
Rockdtben
hornygranny
fleure
MrPerson
Perakp
Ergovisavi
AnturK