Tigercat2000
c562680098
Merge remote-tracking branch 'origin/master' into bay_examine
...
# Conflicts:
# code/game/objects/structures/displaycase.dm
2015-09-15 14:08:36 -07:00
Fox-McCloud
fbcae579a4
Tails Notification Hotfix
2015-09-15 16:24:00 -04:00
Fox-McCloud
873f209079
Merge pull request #1997 from tigercat2000/sneks
...
Alternate tail/body/whatever-can-fit-on-the-tail-layer system
2015-09-15 16:20:16 -04:00
Fox-McCloud
3aa9563f2b
Merge pull request #2049 from Markolie/display
...
Display case update
2015-09-15 16:02:43 -04:00
Markolie
e64ac23677
Further display case improvements
2015-09-15 18:47:19 +02:00
Tigercat2000
d0cd123ac0
Bayxamine: WEAPONS\!
2015-09-15 09:10:17 -07:00
Tigercat2000
b403183d0e
Bayxamine: No cloneX.
2015-09-15 09:05:07 -07:00
Markolie
c43987fe3c
Make Poly sit on computers again
2015-09-15 17:41:15 +02:00
Mark van Alphen
cbb2a16409
Merge pull request #2046 from Fox-McCloud/tech-shell-balance
...
Tech Shells: Silver Removal
2015-09-15 17:36:57 +02:00
Fox-McCloud
76eb759ff6
Merge pull request #2043 from tigercat2000/autohiss
...
Autohiss + Baydev language update.
2015-09-15 00:16:41 -04:00
Markolie
bbfc8f5c5b
Remove another obsolete icon_override
2015-09-15 04:27:09 +02:00
Markolie
be5653a25f
Get rid of item_override
2015-09-15 04:20:46 +02:00
Markolie
90f722d752
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into intercom
...
Conflicts:
code/modules/projectiles/guns/projectile/automatic.dm
icons/mob/back.dmi
2015-09-15 04:18:27 +02:00
Fox-McCloud
6fd7350746
Merge pull request #2040 from Markolie/guns
...
Guns update
2015-09-14 22:11:33 -04:00
Mark van Alphen
54ba4bf878
Merge pull request #2054 from Fox-McCloud/powernet-cleanup
...
Powernet Datum Destroying
2015-09-15 04:01:53 +02:00
Fox-McCloud
e3a6bf535f
Powernet Datum Destroying
2015-09-14 21:54:21 -04:00
Fox-McCloud
be375d98b9
Merge pull request #2014 from veganzombeh/virus1
...
pAIs can no longer force people on help intent to pick them up.
2015-09-14 20:38:10 -04:00
Fox-McCloud
bde7e6bc42
Merge pull request #2037 from Markolie/CMA
...
Add Sergeant Araneus
2015-09-14 20:37:59 -04:00
TheDZD
cdc6c74384
Merge pull request #2045 from Fox-McCloud/reagents-performance
...
Reagents Performance and Garbage Collection
2015-09-14 19:11:52 -04:00
Tigercat2000
f01b8f122c
Remove snake body until better sprite can be found
2015-09-14 15:44:34 -07:00
Fox-McCloud
47cab7ed38
Merge pull request #2053 from Markolie/lesser
...
Fixes
2015-09-14 18:03:49 -04:00
veganzombeh
351beaad3f
Fixes indentation
2015-09-14 21:49:59 +01:00
Markolie
7a0c1bae77
Fix ore redemption deconstruction
2015-09-14 22:26:09 +02:00
Markolie
84c60aa560
Monkey/human transform fixes
2015-09-14 22:13:32 +02:00
Markolie
0c991f7092
Nuke code admin check fix
2015-09-14 22:13:18 +02:00
Tigercat2000
e7434fa9a6
Bayxamine - Weapons thingy mod #commitname
2015-09-14 12:40:15 -07:00
Tigercat2000
0603f73232
Bay12 examine overhaul.
...
This commit overhauls the examine system to baystation's latest system,
including a more efficient verb approach, and a new status panel tab,
which shows more information for pre-defined objects.
2015-09-14 11:51:40 -07:00
Markolie
59b78376e9
Display case update, some forceMove updates
2015-09-14 20:21:56 +02:00
Fox-McCloud
8faf18484c
Tech Shells: Silver Removal
2015-09-14 06:40:35 -04:00
Fox-McCloud
9d2dab6917
Reagents Performance and Garbage Collection
2015-09-14 04:49:29 -04:00
FalseIncarnate
40b4145537
Botany Fixes
...
Fixes invisible plant sprites
Fixes Ghost Peppers missing their New() proc
2015-09-14 04:27:58 -04:00
Tigercat2000
0c7b59748c
Change preference name to 'Auto-Accent' on @Fox-McCloud's recommendation.
2015-09-13 22:16:22 -07:00
Tigercat2000
d900ea027e
Add autohiss for kidan & plasmamen
2015-09-13 22:09:28 -07:00
Tigercat2000
3cb26eca23
Autohiss
...
This commit adds a system (fully client-toggled) to allow unathi and
tajaran to "auto-hiss". This means that, for unathi, "S" will be
automatically extended to "Ss", "Sss", or "Ssss". Which one it changes is
based on a random pick().
There are three modes, off, basic, full.
Off, is obviously, off. It does nothing. This is the default setting.
Basic, for unathi, enables the S extensions, and for tajaran, enables the
"R" extending.
Full, for unathi, enables the S extensions, alongside replacing "X" with
"Ks". It does not currently do anything extra for Tajaran.
Sinta'Unathi is unaffected for Unathi, Siik'Tajr is unaffected for
Tajaran.
On baystation, NO_STUTTER languages would also be unaffected (the noise
language). However, we do not have NO_STUTTER languages. So it hilariously
does affect the noise language. "Zartulnal Hharar dancess."
2015-09-13 21:08:46 -07:00
Tigercat2000
11aeb6367c
Update to baydev language code
...
This commit updates all (hopefully) of language code to the dev branch of
bay12.
Notable changes:
- Silicon and Human say() have been reduced, via moving a large chunk of
language code to /living/say()
- say_quote is no longer 'deprecated' (i don't think it ever was), as
say() uses it.
- HULK, COMIC, slurring, and stuttering's speech effects should now work
properly for all living mobs.
- Drone only-transmit-to-other-drones code is much less messy now.
2015-09-13 20:49:40 -07:00
Markolie
2b74789b37
Burst fire tweaks
2015-09-14 04:39:39 +02:00
Markolie
591f2747ca
Further gun updates
2015-09-14 04:36:41 +02:00
Markolie
700a4797cc
I forgot the freedom eagle
2015-09-14 04:10:50 +02:00
Markolie
f41f0a59fe
Guns update
2015-09-14 04:05:20 +02:00
Fox-McCloud
1727dcda92
Merge pull request #2038 from Markolie/accountsdb
...
Accounts database fixes
2015-09-13 21:12:26 -04:00
Markolie
145d1dc5ec
Accounts database fixes
2015-09-14 02:04:07 +02:00
Markolie
bfa70de3a0
Add Sergeant Araneus
2015-09-14 01:32:49 +02:00
Mark van Alphen
e00799790f
Merge pull request #2020 from Fox-McCloud/rnd-materials
...
Rnd materials
2015-09-14 00:50:30 +02:00
Fox-McCloud
d9f19f6792
Merge pull request #2035 from Markolie/CMA
...
Fix skin tone/color selection in CMA
2015-09-13 18:44:11 -04:00
Markolie
5b407a47a8
Fix skin tone/color selection in CMA
2015-09-14 00:32:18 +02:00
Fox-McCloud
3ce1e989ce
Materials Consistency Fix/Update
2015-09-13 17:49:36 -04:00
Markolie
8a3347523c
Purge Fahrenheit
2015-09-13 23:07:29 +02:00
Markolie
2cf27f9255
Get rid of two obsolete overrides
2015-09-13 23:03:16 +02:00
Markolie
2b23ba0048
In-hands can now be any size
2015-09-13 23:00:31 +02:00
Markolie
ca6c7d10ba
In hand sprite overhaul
2015-09-13 22:44:18 +02:00
