Markolie
3c7413dc65
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into pet
...
Conflicts:
_maps/map_files/cyberiad/cyberiad.dmm
2015-09-22 00:17:30 +02:00
Markolie
3caac1e1e2
Check for 100+ armor
2015-09-21 22:58:42 +02:00
Markolie
f7234374b5
Update armour penetration checks
2015-09-21 22:54:26 +02:00
Markolie
ea305d3ffa
Saber SMG update, add armour piercing variable
2015-09-21 22:50:07 +02:00
Fox-McCloud
e371c9662a
Merge pull request #2106 from Markolie/pipenet
...
Pipenet revamp
2015-09-20 20:47:02 -04:00
Markolie
c5c64413a1
Pipenet overhaul
2015-09-21 02:11:54 +02:00
Mark van Alphen
78556eec24
Merge pull request #2105 from Fox-McCloud/brain-pain
...
Tweaks Brain Damage Messages
2015-09-20 04:45:33 +02:00
Fox-McCloud
fb31916f43
Tweaks Brain Damage Messages
2015-09-19 19:50:48 -04:00
Fox-McCloud
e2a28b981a
Merge pull request #2100 from tigercat2000/broken_say
...
A bunch of saycode fixes
2015-09-19 18:55:54 -04:00
Tigercat2000
d5e5690d11
Whoops, forgot nymph sounds
2015-09-19 10:14:26 -07:00
Tigercat2000
7e522ed730
More emote fixes, universal silicon beeppingbuzz
...
This commit does the following:
- Fixes more oddities and standardizes more emote procs
- All silicons now share beep, ping, and buzz
2015-09-19 10:11:42 -07:00
Tigercat2000
bab04c669e
Emote fixes, most of it's still insane
2015-09-19 08:47:53 -07:00
Tigercat2000
bec780b512
Whoops, forgot to fix nymphs
2015-09-18 21:27:20 -07:00
Tigercat2000
8f90964629
A bunch of saycode fixes
...
Fixes:
- Xenomorphs having cutoff speech
- Brains fucking up all of say
- Redundant say code under slimes, simple animals, xenomorphs
- Redundant say_quotes for humans
- All mobs will now correctly process language speech verbs
Features:
- Xenomorphs now have custom speech verbs for common
- Default languges for Xenomorphs makes more sense, and work
properly
2015-09-18 21:19:14 -07:00
TheDZD
268992a32f
Merge pull request #2081 from Fox-McCloud/borg-update
...
Borg Update: MMI and Suits
2015-09-18 22:31:21 -04:00
TheDZD
7e9b2f99b1
Merge pull request #2091 from Fox-McCloud/destroy-them-all
...
Fixes up a few Destroys
2015-09-18 22:30:49 -04:00
TheDZD
b27753e163
Merge pull request #2088 from Fox-McCloud/point-rework
...
Point Rework
2015-09-18 22:30:22 -04:00
Fox-McCloud
e00775f44e
Merge pull request #2084 from Markolie/looc2
...
LOOC overhaul, stealthmin fixes
2015-09-18 18:05:05 -04:00
Fox-McCloud
8285a9816e
Merge pull request #2096 from Markolie/obs
...
Observer forceMove fix
2015-09-18 17:44:48 -04:00
Fox-McCloud
0888235adb
grabby
2015-09-18 17:33:38 -04:00
Markolie
823b77cd70
Observer forceMove fix
2015-09-18 23:02:51 +02:00
Markolie
a52b371e22
Flavor text examine fix
2015-09-18 18:16:20 +02:00
Fox-McCloud
74565c101b
Fixes up a few Destroys
2015-09-18 04:20:02 -04:00
Mark van Alphen
739e820faa
Merge pull request #2078 from Fox-McCloud/experimentor
...
EXPERI-Mentor Addition--Telesci Removal
2015-09-18 07:18:55 +02:00
Fox-McCloud
4a37aaecfa
CD fixup
2015-09-17 22:53:32 -04:00
Fox-McCloud
480613208d
Point Rework
2015-09-17 22:26:03 -04:00
Markolie
279c998ae8
OOC/LOOC update, stealthmin fixes
2015-09-17 21:27:24 +02:00
Markolie
82b3d8c469
Temporarily revert language fix pending language prefix rewrite
2015-09-17 18:30:53 +02:00
Fox-McCloud
b01d49d72c
Borg Update: MMI and Suits
2015-09-17 06:50:24 -04:00
Fox-McCloud
d41b09c0a6
Experimentor Addition--Telesci Removal
2015-09-17 00:59:38 -04:00
Markolie
67d1cafc29
Language fixes
2015-09-17 03:42:14 +02:00
Fox-McCloud
ce91a30da3
Merge pull request #2071 from Markolie/lawstate2
...
Update additional law channel handling, debug fix
2015-09-16 20:53:04 -04:00
Mark van Alphen
bb1d3362f3
Merge pull request #2074 from tigercat2000/why
...
I have no idea why you would ever sanitize() say, it already strips html
2015-09-17 01:07:56 +02:00
Tigercat2000
63a47eeca4
I have no idea why you would ever sanitize() say, it already strips html
2015-09-16 15:31:25 -07:00
Markolie
7b6dee1f6b
Update additional law channel handling
2015-09-16 18:27:46 +02:00
Markolie
0db98340f8
Further welding tool updates
2015-09-16 01:37:07 +02:00
Markolie
951b58af5a
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lawstate
...
Conflicts:
code/game/objects/items/weapons/tools.dm
2015-09-16 01:32:33 +02:00
Markolie
aeabab7248
Welding tool refactor, in-hand updates
2015-09-16 01:27:15 +02:00
Fox-McCloud
894d13fa4d
Merge pull request #2065 from Markolie/lawstate
...
Fixes
2015-09-15 17:42:34 -04:00
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
Markolie
914b3742ed
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lawstate
2015-09-15 23:06:56 +02:00
Markolie
5e856a0aaf
Law manager channel fixes
2015-09-15 23:02:04 +02: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
Markolie
c43987fe3c
Make Poly sit on computers again
2015-09-15 17:41:15 +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
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
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
