phil235
1f6a6b0e8c
Merge branch 'master' of https://github.com/tgstation/-tg-station into AlienIconUpdateFix
...
Conflicts:
code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
code/game/objects/structures/stool_bed_chair_nest/bed.dm
2015-04-06 19:38:51 +02:00
Cheridan
1da595b535
Merge pull request #8737 from RemieRichards/NinjaCleanup2
...
A restructure/removal/cleanup of Ninja Code [Part 2] - Abilities and stuff
2015-04-05 21:54:33 -05:00
Remie Richards
9c6c68b81a
Removes SpiderOS, SpiderOS Information moved to a SpiderOS Statpanel, Fixes ninja_sword_recall() by preventing a katana from ever hitting its owner (it can still hit other ninjas)
2015-04-05 01:55:27 +01:00
Jordie
6d34032385
Merge pull request #8628 from Fayrik/AllTheSmallThings
...
Someone called for pest control?
2015-04-04 20:58:07 +11:00
Jordie
3bb6cc8af9
Merge pull request #8625 from xxalpha/cyberplus
...
Cyber Implants +
2015-04-04 20:57:48 +11:00
Jordie
13a6a51550
Merge pull request #8689 from GunHog/InOtherNewsMoreRDsHaveBeenSpacedLately
...
Removes slowdown from Reactive Teleport Armor and increases activation chance
2015-04-04 20:57:33 +11:00
Jordie
19af7bd19e
Merge pull request #8570 from RemieRichards/FireSpread
...
Fire spread on mob touch
2015-04-04 20:56:58 +11:00
Jordie
7dbd8b1d02
Merge pull request #8706 from phil235/WeakenedFix
...
Fixes weakened/stunned/paralysis not going down naturally for aliens.
2015-04-04 20:56:32 +11:00
Cheridan
0bd95eaa54
Revert "AN0N3 RUINED APRIL 1ST SO NOW I'M PRING THIS FOR REAL"
2015-04-02 21:13:50 -05:00
phil235
e834781427
Fixes weakened/stunned/paralysis not going down naturally for aliens.
2015-04-02 23:25:08 +02:00
Jordie
4c1c55906f
Merge pull request #8666 from phil235/AnimalsUpdatehealthFix
...
Fixes simple_animals being immune to fire damage melee attacks.
2015-04-02 20:16:18 +11:00
GunHog
89a8e8dea4
Fixes Reactive Teleport Armor
...
- Makes the armor actually teleport again!
2015-04-01 21:14:02 -05:00
GunHog
c9e7d949e1
Buffs teleportation chance to 50 percent!
...
- Also prepares the ritual sacrifice to the Eternal Jordie, God of
Changelogs.
2015-04-01 20:49:42 -05:00
dannno
6e83015145
fixes critical priority bug
...
jesus christ think of all those g's. jesus fucking christ. what have we done
2015-04-01 21:49:14 -04:00
hornygranny
35498dc200
Merge pull request #8686 from sawu-tg/npcpool
...
Fixes to SNPCs
2015-04-01 11:47:57 -07:00
Sawu
799eadb6c8
Fixes to SNPCs
...
* Fixes two runtimes (stat menu and taking a delegate/assistant)
* Fixes SNPCs not being inserted into the NPCPool
* Makes the NPCPool fire more often for maximum robustness.
2015-04-02 05:19:21 +11:00
Swag McYolosteinen
e886207f58
Merge pull request #8684 from Cheridan/chem_farts
...
AN0N3 RUINED APRIL 1ST SO NOW I'M PRING THIS FOR REAL
2015-04-01 18:29:25 +02:00
Cheridan
053046c970
typo fix
2015-04-01 06:28:23 -05:00
Jordie
691411c76c
Merge pull request #8648 from Cheridan/collared
...
Fixes collar stuff
2015-04-01 18:45:02 +11:00
Jordie
904b27dcd7
Merge pull request #8607 from Iamgoofball/fuck
...
Fixes *flip
2015-04-01 18:44:20 +11:00
Iamgoofball
86a1c9927a
removes feedback msg, fixes checks
2015-03-31 20:13:09 -07:00
phil235
9261196b4f
Fixes simple_animals being immune to fire damage melee attacks.
...
Fixes slime being able to latch onto other slimes with mouse_drop (but not the feed verb)
2015-03-31 21:29:34 +02:00
Jordie
2d94da8e59
Merge pull request #8592 from phil235/AlienAttackBlob
...
Fixes alien humanoids not being able to attack blobs.
2015-03-31 19:11:12 +11:00
ACCount12
f10d0df8cf
Merge remote-tracking branch 'origin/master' into mining
2015-03-31 18:31:12 +12:00
ACCount12
1c219f0ebe
A lot of stuff
2015-03-31 18:30:09 +12:00
Cheridan
67d9f77ea9
Merge pull request #8600 from phil235/AlienNestFixing
...
Fixes alien nest buckling
2015-03-31 00:06:14 -05:00
Cheridan
3865495994
Fixes collar stuff
2015-03-30 18:22:25 -05:00
phil235
e88e8a4ed5
Fixes drowsyness never going down.
2015-03-31 00:27:32 +02:00
phil235
efaeaaa0bd
Removing unused larva/login.dm
2015-03-30 23:23:47 +02:00
phil235
12a729adcd
Fixes many instances of lying mob getting shifted up (pixel_y reset to 0) by adding a lying_pixel_offset var to mob/living.
...
Removes the delay when toggling resting, sleeping and pouncing, the mob sprite will now update instantly.
2015-03-30 23:14:21 +02:00
phil235
314e9424ae
Giving simple_animal their own version of update_canmove(). This fixes small animals' density being always set to 1 by life().
...
Fixes pixel y shift when lying down as an alien.
Removes the no longer needed slime/update_icons.dm
Fixes alien icon var being reset to its initial value during every life(). I added an alt_icon var to aliens to achieve that.
Fixes alien humanoid no using the unconscious icon instead of their sleeping icon when sleeping.
2015-03-30 22:11:05 +02:00
xxalpha
c1bf12345e
Added ability for Medical HUDs to detect cybernetic implants.
2015-03-30 17:52:08 +01:00
Cheridan
74d2d67280
Merge pull request #8604 from Niknakflak/NakedCorgis
...
Adds the ability to shave all types of corgis
2015-03-30 08:26:01 -05:00
Fayrik
9b834fca7a
Look at all these bugs that no longer exist!
2015-03-30 03:36:24 +01:00
NikNakFlak
010fed04c6
Spelling
2015-03-29 15:30:58 -07:00
NikNakFlak
306adf7d95
Corgi fixes.
2015-03-29 13:21:56 -07:00
Cheridan
bf36e8d040
Merge pull request #8615 from sawu-tg/npcpool
...
Updates the NPCPool to current branch.
2015-03-29 15:10:15 -05:00
NikNakFlak
a4c870669d
Code changes to corgi.dm and changelog
2015-03-29 12:44:42 -07:00
Sawu
ab776cf014
Updates the NPCPool to current branch.
...
see #7012
* NPCPool will co-ordinate and organize all SNPCs, making them stronger and more intelligent.
* SNPCs can use the botPool system to co-ordinate and delegate with each other.
* SNPCs have been given factions to allow interoperability between certain types of SNPCs.
* Bots (machinery/bot) can use the system too for basic help and coordination.
2015-03-30 02:50:21 +11:00
xxalpha
66c47c98e1
Added check for inbuilt jetpack in movement_delay proc.
2015-03-29 16:15:13 +01:00
xxalpha
937aea030f
Merge remote-tracking branch 'upstream/master' into fasterspace
...
Conflicts:
code/modules/mob/living/carbon/human/species.dm
2015-03-29 15:30:38 +01:00
Jordie
fdbef46277
Merge pull request #8543 from Szunti/mining-mobs-night-vision
...
Night vision for mining mobs
2015-03-30 01:22:53 +11:00
Jordie
f5cf0dd3e9
Merge pull request #8392 from xxalpha/hardjet
...
Embedded Jetpacks
2015-03-30 01:21:05 +11:00
Remie Richards
2dec0e8fa4
Fixes Hat removal code by reticking carbon/inventory and moving carbon inventory code back there. (Mystery coder who undid this, Curse you!)
2015-03-29 14:45:09 +01:00
Iamgoofball
3d61826a6a
Fixes *flip
2015-03-28 23:04:50 -07:00
NikNakFlak
89defc1d8b
Adds the ability to shave all types of corgis, including ian, lisa, regular corgis, and corgi puppies.
2015-03-28 19:24:13 -07:00
phil235
2ef01a61c5
Fixes alien nest not blocking the victim from instantly unbuckling. The victim now needs to click the nest or resist, then wait 2 minutes before being free.
...
Fixes alien nest buckling pixel offset.
Removes resist unbuckling 'success' message so there's not two unbuckling messages.
Fixes objects with buckling not unbuckling its buckled mob when the mob is gibbed (Fixes alien nest overlay not disappearing when larva burst and gib its host).
2015-03-28 23:02:44 +01:00
Swag McYolosteinen
eca852a8c1
Merge pull request #8569 from sawu-tg/easterevent
...
Easter is Out!
2015-03-28 19:32:49 +01:00
phil235
c67423adf5
Fixes alien humanoids not being able to attack blobs.
...
Created a take_damage() proc for obj/effect/blob.
Slight adjustment of the values of damage to blobs.
Fixes typo in pod people attack message (changed the verb from "slice" to "slash")
2015-03-28 19:27:07 +01:00
Swag McYolosteinen
bdfd2a2f7c
Merge pull request #8554 from RemieRichards/MonkeyHats
...
Monkeys can wear hats!
2015-03-28 13:47:35 +01:00
