Commit Graph

5736 Commits

Author SHA1 Message Date
tkdrg
6a645cc997 Merge pull request #13908 from KorPhaeron/creature
Fixes the wizards pet dying every round
2015-12-23 14:47:04 -03:00
tkdrg
146f97fcd6 Merge pull request #13917 from AnturK/dailyfix
Makes cyborg module failure instant
2015-12-23 14:45:37 -03:00
tkdrg
434598b0e4 Merge pull request #13853 from KorPhaeron/NOSHIELD
Removes NOSHIELD flag, gives NOSHIELD items armour penetration
2015-12-23 03:17:01 -03:00
tkdrg
f16da0d02b Merge pull request #13882 from KorPhaeron/layer_fix
Fixes monster spawners being on the same layer as mobs
2015-12-22 20:02:25 -03:00
tkdrg
830e50c1ba Merge pull request #13889 from Incoming5643/Mulebot_#11_I_am_coming_for_YOU
The MULE's "run your dumb ass over" attack now respects armor
2015-12-22 19:48:41 -03:00
tkdrg
4c4a413943 Merge pull request #13886 from AnturK/denyfreezegreentext
A handful of fixes.
2015-12-22 15:53:08 -03:00
tkdrg
e65df708b6 Merge pull request #13881 from KorPhaeron/nest_fix
Simple animals tell their nest when they die
2015-12-22 15:04:31 -03:00
tkdrg
b33863c911 Merge pull request #13876 from KorPhaeron/slaughter_means_slaughter
Slaughter Demons delete consumed victims again
2015-12-22 15:02:46 -03:00
AnturK
3d51605a21 Makes cyborg module failure instant 2015-12-22 16:46:45 +01:00
KorPhaeron
23c891ddbe Creature 2015-12-22 07:53:54 -06:00
Jordie
cc7da70520 Merge pull request #13843 from MrStonedOne/justshakeitoff
Smooth pixel screens shakes!
2015-12-22 21:50:18 +11:00
MrStonedOne
5bcc40aeae improves pixel screen shakes 2015-12-22 02:08:21 -08:00
tkdrg
7817f9d745 Merge pull request #13871 from KorPhaeron/ghostize
[s] Fixes being able to return to your body after another ghost takes control
2015-12-22 04:28:18 -03:00
tkdrg
661b168d18 Merge pull request #13868 from Incoming5643/Always_a_follow_up_pull_these_are_the_rules_see_I'm_doing_it_on_purpose_guys_it's_a_meme_hahahahahahahaaaaaaaaaaa
Fixes human tail wagging being an endless nightmare that can only end in death
2015-12-22 02:59:00 -03:00
tkdrg
82da7c6768 Merge pull request #13833 from KazeEspada/Cockroaches
Adds dirty fucking cockroaches.
2015-12-21 23:08:51 -03:00
KazeEspada
40be68eaf7 Span classed
Added span classes and a missing \The.
2015-12-21 19:02:39 -07:00
KazeEspada
139d1d1f5c Ready for merge!
All issues resolved and cockroaches should be ready for merging.
2015-12-21 17:23:47 -07:00
tkdrg
a08afebf02 Merge pull request #13857 from xxalpha/drycleaning
Adds a bottle of drying agent spray to janiborg.
2015-12-21 19:39:13 -03:00
AnturK
4f975e2768 Fixes medbots ignoring tabled victims. 2015-12-21 22:49:05 +01:00
Incoming
6b3055426c MULE's "run your dumb ass over" attack now respects armor 2015-12-21 15:48:59 -05:00
AnturK
2a521cd823 Fixes medbots ignoring tabled people 2015-12-21 20:18:33 +01:00
tkdrg
c9ad9af2c5 Merge pull request #13809 from AnturK/ghosthudpref
Makes Ghost HUD toggle persistent
2015-12-21 14:36:19 -03:00
KorPhaeron
c805331bdf Fixes nest layer 2015-12-21 08:57:18 -06:00
KorPhaeron
fac3665f0f Infinite skeletons 2015-12-21 08:54:34 -06:00
KorPhaeron
03ead46f44 Slaughter Demon Devour 2015-12-21 07:24:02 -06:00
KorPhaeron
7200c74d90 Fixes various ghost replacement things 2015-12-21 02:43:42 -06:00
Incoming
c773277123 Fixes human tail wagging not being endable because human tails were done in a somewhat cruddy way and I didn't notice. 2015-12-20 23:42:45 -05:00
tkdrg
181417723e Merge pull request #13816 from AnturK/bottopicfix
Fixes Bot topic checks
2015-12-20 20:45:49 -03:00
xxalpha
8d586cef49 Adds a bottle of drying agent spray to janiborg. 2015-12-20 21:57:43 +00:00
KorPhaeron
a0923daa0e Removes NOSHIELD 2015-12-20 15:21:58 -06:00
tkdrg
bab0d21e5a Merge pull request #13759 from KorPhaeron/copyofacopyofacopyofacopyofacopy
Merges Malf AI and traitor AI into a single antag type, no longer has its own mode
2015-12-20 16:18:37 -03:00
KazeEspada
6faa2cfbe2 Cockroach fixes and some changes to what can and can not crush them. 2015-12-20 12:13:25 -07:00
MrStonedOne
19fab849c0 Smooth pixel screens shakes! 2015-12-20 11:09:21 -08:00
AnturK
879bb6c0c0 A bit more sensible solution 2015-12-20 19:36:40 +01:00
tkdrg
a73f3261b3 Merge pull request #13771 from AnturK/pipecrawl
Ventcrawling fixes
2015-12-20 14:23:55 -03:00
AnturK
46a11b0542 Ventcrawling fixes 2015-12-20 11:15:13 +01:00
KazeEspada
0489f48f7c Adds dirty fucking cockroaches. Just added as a mob and not too any maps. 2015-12-20 02:20:08 -07:00
KorPhaeron
bfced13c70 Doomsday Device 2015-12-20 02:23:42 -06:00
Cheridan
bde3995bc1 Merge pull request #13790 from tkdrg/niggers
Fixes invisible mask exploits
2015-12-19 23:10:05 -06:00
tkdrg
0c1855ea18 Merge pull request #13777 from Xhuis/totally_not_for_an_upcoming_project
Merges all things related to side-/mini-antagonists into a single folder
2015-12-19 23:24:33 -03:00
tkdrg
c01e4d10a4 Merge pull request #13792 from Incoming5643/isnt_one_tail_bad_enough
Fixes weird lizard feature issues
2015-12-19 23:17:09 -03:00
tkdrg
c75a038676 Merge pull request #13796 from KorPhaeron/AI_follow
Clicking the (F) link on AI speech while make you orbit their camera eye
2015-12-19 23:15:46 -03:00
AndrewJacksonThe2nd
34733cf01c fuck shit pornhub 2015-12-19 18:01:05 -08:00
AndrewJacksonThe2nd
6207d9e052 haha whoooopppppppsssss 2015-12-19 17:52:06 -08:00
AndrewJacksonThe2nd
0d65351d3f fixes 2015-12-19 17:51:11 -08:00
AnturK
5e45b7efd0 Fixes bot topic checks 2015-12-19 21:47:07 +01:00
AndrewJacksonThe2nd
1ab5e80458 Tesla map removal to fix merge 2015-12-19 12:32:50 -08:00
AnturK
3c26d125a7 Makes Ghost HUD toggle persistent 2015-12-19 15:26:14 +01:00
tkdrg
e873395ffa Merge pull request #13659 from bgobandit/beepskyfunremoval
Beepsky will no longer hunt aliens.
2015-12-19 02:49:33 -03:00
Incoming
b621fb10d5 Removes special handling for mutant features on cloning. It didn't work and is inconsistent with how the rest of cloning works (it takes a snapshot of how you looked at the moment of death, including things that might not strictly be "genetic" like dyed hair color). 2015-12-18 21:48:06 -05:00