63fa330885
Merge pull request #5314 from Chakirski/AIholopets
...
Adds AI Holopets
2016-08-07 23:06:59 -04:00
bf52aec722
Merge pull request #5348 from LittleBigKid2000/aesthetic-sunglasses
...
Adds cosmetic sunglasses
2016-08-07 23:06:20 -04:00
0eed28cdba
Corgi Gender Equality ( #5330 )
...
* Corgi Gender Equality
* I'd prefer to die on my own terms, thanks
2016-08-07 23:06:07 -04:00
b81e746027
Fixes changeling bug ( #5350 )
...
* fox's suggestion
* changeling updates
* changeling fixes
* Update changeling.dm
* Update changeling.dm
2016-08-07 23:00:41 -04:00
bc2ce6a7b0
Merge pull request #5349 from Fox-McCloud/headphones
...
Adds in Headphones
2016-08-07 22:58:35 -04:00
6d449de47a
Merge pull request #5344 from Fox-McCloud/atom-say
...
Atom Say Refactor
2016-08-07 22:57:32 -04:00
ce773d22a2
Merge pull request #5346 from KasparoVy/locker_z_level_voodoo_fix
...
Fixes Accidental Greentext for Maroon and Redtext for Assassination Objectives, Resolves #5306
2016-08-07 20:01:29 -04:00
6edee2b55a
No locker permastuns.
2016-08-07 11:48:09 -04:00
5c47e4d9ce
Merge pull request #5328 from pinatacolada/sweden
...
Makes the swedish gene more swedish
2016-08-06 21:05:51 -04:00
f5826a0c2b
Adds in Headphones
2016-08-06 19:55:08 -04:00
4b46c2cf6b
Adds cosmetic sunglasses
2016-08-06 19:43:55 -04:00
fe242bcee0
Update bscrystal.dm
2016-08-07 00:33:52 +01:00
3658b3b5ad
Update stack_recipe.dm
2016-08-07 00:33:32 +01:00
692754c81a
fox's changes
2016-08-07 00:31:36 +01:00
8d26c41cb1
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into keta
2016-08-07 00:16:03 +01:00
c4756e39e1
fox's suggestion
2016-08-07 00:11:00 +01:00
7b502a0989
get_turf instead of snowflake_check
2016-08-06 16:10:06 -04:00
d6fc1c7096
Fixes Accidental Greentext for Maroon and Redtext for Assassination Objectives.
...
If you had the maroon objective as a traitor and your target was in any
sort of locker on the shuttle when it docked, it would give you green
text.
Maroon objectives now check if the target's in a locker and, if so,
checks the locker's location in order to correctly evaluate objective
completion.
If you had the assassination objective as a traitor and you killed them,
yet they were on a Z-level greater than the Derelict, it would give you
red text.
Assassinations are now location insensitive.
2016-08-06 15:37:27 -04:00
7bc9b0c47f
Merge pull request #5295 from chopchop1614/feta
...
Fixes horsemask bug
2016-08-06 06:57:38 -04:00
03eb9be741
Atom Say Refactor
2016-08-06 06:45:20 -04:00
346dd3cd70
Update horsemask.dm
2016-08-06 11:32:54 +01:00
5ea4d4ab2f
Update horsemask.dm
2016-08-06 11:32:26 +01:00
e4756ba621
Merge pull request #5342 from Earthdivine/Secrets-Rename
...
Strike Team Clarity
2016-08-05 19:59:44 -04:00
2530555bf6
Merge pull request #5304 from Ar3nn/teleshock
...
Fixes TK users being shocked for no reason when using shocked machinery
2016-08-05 19:34:42 -04:00
38206e5b61
Merge pull request #5334 from FlattestGuitar/holy
...
Nerfs holy water.
2016-08-05 19:33:40 -04:00
bd4fa6de04
Changed "Send in a strike team" to "Send in the Deathsquad." for more clarity.
2016-08-05 18:19:11 -05:00
f5c0455de5
Oh
2016-08-05 18:58:38 -04:00
f2c1c7406d
Various grammar/spelling fixes
2016-08-05 18:43:33 -04:00
1b03ac78fd
Fix
2016-08-04 19:20:19 -04:00
3888bcb1f1
Makes holy water stutters non-op
2016-08-05 00:38:31 +02:00
7dc26f08c5
Merge pull request #5327 from Chakirski/duffelfix
...
Duffel Voodoo and Spelling Fix
2016-08-04 17:50:37 -04:00
7476da1c49
Merge pull request #5294 from yurivw/shuttleoptions
...
Removed unused options in secrets menu
2016-08-04 17:48:41 -04:00
2b467d50c8
Merge pull request #5318 from Chakirski/SpritFixes
...
Fixes Sprite Voodoo and Hoodies
2016-08-04 17:47:26 -04:00
660ffdded5
only sergey can stop white space abuse
2016-08-04 19:25:21 +01:00
e24ecd0a11
i know what i'm doing trust me i have like degrees
2016-08-04 19:17:10 +01:00
c83b6a3375
nice indenting pinata
2016-08-04 19:10:46 +01:00
fc54696914
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into sweden
...
# Conflicts:
# code/game/dna/genes/goon_disabilities.dm
2016-08-04 18:56:06 +01:00
7d7c9aa647
please god tell me i fixed the morgue conflict
2016-08-04 18:50:05 +01:00
ea35dc2b24
attempting to fix morgue conflicts
...
and probably failing
2016-08-04 18:02:01 +01:00
b1c3a51561
now it's organized
2016-08-04 17:49:11 +01:00
a37f52abaa
Makes the swedish gene more swedish
...
http://puu.sh/qpJiJ/957288bc2b.png
Also because I'm not sure if git will fuck up the encoding or not:
http://puu.sh/qpJpa/d4e5bd814e.png
🆑 Pinatacolada
add: Makes the swedish gene spit out weird swedish chars and sounds
/🆑
2016-08-04 17:43:53 +01:00
6dca3112b3
The fact this is inconsistent hurts me.
2016-08-04 11:29:26 -05:00
e9886d05fc
Human overlay caching and minor overlay fixes
2016-08-04 11:14:56 -04:00
1f703104e4
Less stealth more sprite.
2016-08-03 22:54:00 -05:00
44ae3a4a68
Merge pull request #5309 from Fox-McCloud/field-generators
...
Field Generator Cleanup, Singularity Fixes,
2016-08-03 23:29:09 -04:00
d018389a12
Merge pull request #5312 from Fox-McCloud/destroy-them-all
...
Fixes Two Destroys
2016-08-03 23:28:43 -04:00
15d7d16ec8
oops
2016-08-03 22:34:29 -04:00
d54e842692
I can already tell only some of these will ever be used.
2016-08-03 19:49:44 -05:00
ea0f5b9802
Ports typecaches and their use in the tesla
2016-08-03 20:08:51 -04:00
3c671d7ae4
Merge pull request #5311 from Krausus/TheyreSelfCleaningAndOrMagical
...
Fixes Cremation of Self-Deleting Mobs
2016-08-03 19:42:35 -04:00
Fox McCloud
