5cf93a55ea
Merge pull request #2804 from Perakp/borgAnimations
...
Animated cyborg transformations
2014-02-19 19:02:34 +00: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
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
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
9b8656247c
u_equip is now called unEquip PANIC
2014-02-13 20:58:33 +01:00
9f35b24dd7
Increased egg hatch chance from 10% to 25%
2014-02-13 19:15:58 +00:00
b8b57ff4f1
Replaced canremove with NODROP.
2014-02-13 19:52:46 +01:00
4ef72bd071
Merge pull request #2746 from Ergovisavi/pai_runtimes
...
Fixes runtimes generated by the pai mob when it tries to click on things
2014-02-13 18:48:24 +00:00
fbcacb4fa4
Merge pull request #2755 from hornygranny/syndieborg
...
Fixes #2723
2014-02-13 11:39:19 -06:00
940aa0574d
you can't add items to people handcuffed.
...
Moved some stuff around on the equipping code, stuff might go wrong but I can't see anything yet.
2014-02-13 13:58:53 -03:00
5768a0d58e
These variables aren't used anywhere in the code. Removed.
2014-02-13 10:12:35 -06:00
db0009d334
Merge pull request #2693 from Giacom/spooky_scary_statues
...
Just some general polishing for the statue mobs.
2014-02-13 11:36:21 +00:00
28a11b4db2
Merge pull request #2736 from Ergovisavi/who_smashes_the_smashers
...
Removed environment_smash for a few hostile mobs that don't need it.
2014-02-13 02:00:29 -06:00
458e955366
Merge branch 'master' of https://github.com/tgstation/-tg-station into blobjob
...
Conflicts:
code/modules/mob/transform_procs.dm
2014-02-12 21:37:59 -05:00
aa303fac2d
Monkey attack messages now use span class
2014-02-12 16:43:31 -08:00
883ab28dde
Blobize edge case fix
...
Fixes an edge case for blobize where if you open someone's player panel and they ghost between then and when you hit the blobize button it still gives priority to them for the created blob.
Note that you can't usually get the option to blobize a player if they've left their body before you open the player panel, if you want to blobize a specific person in this way, ask for them to return to their body.
2014-02-12 19:13:18 -05:00
4933571c5e
Changed "Monkey (420) has bit x" messages to "(Monkey (420) bites x"
2014-02-12 13:57:47 -08:00
2edc78a4fb
Merge pull request #2676 from Tenebrosity/nospacefallspls
...
Removes falling over in space, fixes #2680
2014-02-12 13:16:59 -08:00
1db0b1be71
Fixes #2383
2014-02-12 13:12:45 -08:00
1307a9e388
Makes NODROP work for carbons, adds sanity checks to u_equip calls.
2014-02-12 21:08:09 +01:00
fc25325c24
Fixes #2723
2014-02-12 11:06:00 -08:00
8c7ef19be6
Replaced before_take_item() and drop_from_inventory() with u_equip
2014-02-12 19:51:37 +01:00
23a2f5b38c
Fixes runtimes generated by the pai mob when it tries to click on things
2014-02-11 18:15:25 -08:00
f900a3b148
Removes environment_smash for a few hostile mobs that don't really need it. Pete started breaking tables instead of just windows after the simple mob overhaul and too much fun was occurring.
2014-02-11 00:37:30 -08:00
dd7c8f53a7
Adds the basic framework of NODROP
2014-02-10 20:13:04 +01:00
892ffd3879
Merge branch 'master' of https://github.com/tgstation/-tg-station into asteroid_overhaul
2014-02-09 22:37:20 -08:00
fleure
Perakp
Miauw
Razharas
Aranclanos
Ergovisavi
Hornygranny
MrPerson
AnturK
Rockdtben
Cheridan
Incoming