Commit Graph

5099 Commits

Author SHA1 Message Date
TheDZD
868504bdc4 Merge pull request #3430 from Fox-McCloud/liches
Adds in Lichdom and Lesser Summon Guns Spells--Wiz Tweaks
2016-01-29 21:47:10 -05:00
Fox-McCloud
1ff23cd3ca lesser summon guns, wizman update 2016-01-29 09:12:37 -05:00
Tastyfish
511a9757de Renamed manifest section Support to Service 2016-01-28 22:30:45 -05:00
Tastyfish
ba2f797ed3 Adds Supply section to manifest 2016-01-28 21:12:20 -05:00
TheDZD
3c35269615 Merge pull request #3417 from Fox-McCloud/spoopy
Adds in Skeleton Race
2016-01-28 16:02:18 -05:00
Fox-McCloud
243fae96c6 flag split 2016-01-27 16:36:43 -05:00
Fox-McCloud
2242fac80a TG Riot Shield Port and Tweaks 2016-01-26 22:06:05 -05:00
Fox McCloud
dcde6936ac Merge pull request #3384 from KasparoVy/Blueshield-Beret-Fix
Blueshield Beret Tweak
2016-01-26 00:04:38 -05:00
Crazylemon
9099116ae7 Ais can now hear their radio again 2016-01-25 10:12:42 -08:00
KasparoVy
cf005e9987 Readds black beret to locker, gives it armour. 2016-01-25 02:08:38 -05:00
KasparoVy
5e4a2b5dea Blueshield Beret Tweak
Adds a navy blue version of the Centcom Officer's beret, giving it to
the Blueshield.

Gives the Blueshield beret the exact same armour and strip-delay values
as the SECURITY OFFICER'S beret.
2016-01-24 22:48:10 -05:00
VampyrBytes
1517e716b1 Fixes #3354 and goes with damage suggestion in #3367
If you try to stab someone in the eyes who doesn't have eyes they now
take 10-14 head damage
2016-01-24 09:34:41 +00:00
VampyrBytes
d1cdbc3739 Revert "Fixes #3354"
This reverts commit d24b2fc014.
2016-01-24 09:28:50 +00:00
VampyrBytes
d24b2fc014 Fixes #3354
If you stab someone who doesn't have eyes in the eyes it now damages
their head
2016-01-24 08:37:10 +00:00
Fox-McCloud
fff0590492 Merge remote-tracking branch 'upstream/master' into knife-refactor-cargo-swat 2016-01-23 18:04:02 -05:00
TheDZD
eca90c1321 Merge pull request #3334 from Fox-McCloud/knight-armor
Ports Knight Armor
2016-01-23 17:51:51 -05:00
Fox-McCloud
7d30c5aa8f chaplain closet 2016-01-23 07:57:30 -05:00
Fox-McCloud
14a2022ef4 sword 2016-01-23 07:29:36 -05:00
Tastyfish
4c6a8b49e9 Fixed table placing messing up adjacent flipped tables 2016-01-22 12:01:03 -05:00
Fox-McCloud
f5220f7ce3 Assault Surplus Create and Knife Refactor 2016-01-22 10:04:24 -05:00
Fox-McCloud
a5622a230f Ports Knight Armor 2016-01-22 07:14:55 -05:00
Tigercat2000
9926210354 Fixes #3323, sanitize your shit 2016-01-21 22:00:22 -08:00
Fox McCloud
ccf7297da8 Merge pull request #3297 from Tastyfish/stop-hotwiring-the-tesla-you-tossers
Trained Poly on proper tesla engine use.
2016-01-21 18:21:48 -05:00
Fox McCloud
0c4b851da7 Merge pull request #3288 from FalseIncarnate/master
Cigarette Pack Functionality
2016-01-20 18:33:09 -05:00
TheDZD
c8c7382691 Merge pull request #3284 from Fox-McCloud/telecrystal-change
Raw Telecrystal on Uplink Implants
2016-01-20 18:24:53 -05:00
TheDZD
7387fe34f9 Merge pull request #3289 from Fox-McCloud/pai-cooldown
pAI Cooldown Reduction
2016-01-20 18:24:48 -05:00
Tastyfish
2406f7f432 Fixes table flipping graphics 2016-01-20 03:41:09 -05:00
Tastyfish
d50c1ee3da Trained Poly on proper tesla engine use. Player simple mobs can now hear headsets as applicable. 2016-01-20 02:13:38 -05:00
TheDZD
c7b9c3dc6e Merge pull request #3273 from Fox-McCloud/implant-refactor-II
Implant Refactor Part II
2016-01-19 19:11:10 -05:00
Fox-McCloud
2ee71405ee pAI Cooldown Reduction 2016-01-19 06:24:39 -05:00
FalseIncarnate
fca3996fcb Cigarette Pack Functionality
Adds the ability to put cheap lighters and individual matches into
cigarette packs at the cost of cigarette slots.
- A cheap lighter takes up the space of 2 cigarettes
- Zippos won't fit, they are too boxy.
- A match takes up the space of 1 cigarette.

Increases the w_class of all lighters (cheap, zippo, and special zippos)
from 1 to 2
- Still fits in pockets, just can't shove as many into a box as they
take up more space

Adds the ability to light and put out matches on your shoes.
- Good for when you lose that matchbox (or shove matches into a cig
pack) and need a light.
- Works on all shoes, from the humble brown shoes to the devious
syndicate magboots, and even the clown shoes.

Based on the suggestion from:
http://nanotrasen.se/phpbb3/viewtopic.php?f=12&t=6880
2016-01-19 02:49:00 -05:00
Fox-McCloud
dd587ab4c5 Raw Telecrystal on Uplink Implants 2016-01-19 00:23:56 -05:00
Fox-McCloud
3bae432c26 exploit fix 2016-01-18 23:56:17 -05:00
Fox-McCloud
b4244b3921 Fixes Some Items Attacks 2016-01-18 01:25:10 -05:00
Fox-McCloud
4fe83049fd death alarm sanity 2016-01-17 20:40:12 -05:00
Fox-McCloud
1bd3da4521 Implant Refactor Part II 2016-01-17 20:03:41 -05:00
TheDZD
69f6c178aa Merge pull request #3251 from Fox-McCloud/implant-refactor
TG Implant Refactor/Overhaul
2016-01-17 18:37:50 -05:00
TheDZD
b1e6f7c0a8 Merge pull request #3157 from DaveTheHeadcrab/blueshitgun
Blueshield: Advanced Stun Revolver
2016-01-16 23:17:54 -05:00
Fox-McCloud
ff9acaf730 Merge remote-tracking branch 'upstream/master' into implant-refactor 2016-01-16 20:52:36 -05:00
Fox McCloud
9e55d11fa9 Merge pull request #3178 from Aurorablade/insertlewdcommenthere
try to fix mindslave implant hud
2016-01-16 20:39:57 -05:00
Fox McCloud
fb50b53017 Merge pull request #3246 from Jey123456/altclickdeflate
alt click to deflate inflatable walls / doors.
2016-01-16 19:52:56 -05:00
Fox-McCloud
4558e0e8ae better pad 2016-01-16 19:48:13 -05:00
Aurorablade
f40daffbe8 I FIXED IT 2016-01-16 15:50:43 -05:00
Fox-McCloud
8c229280d2 consistency helps 2016-01-16 04:44:56 -05:00
Fox-McCloud
ec350a0b5c TG Implant Refactor/Overhaul 2016-01-16 01:50:10 -05:00
Jey
189ac6f4e6 -small change 2016-01-15 14:10:47 -05:00
Jey
6002ec00e1 simple quality of life tweak to the inflatable walls / doors.
Alt-click on an inflated one to deflate (same as the deflate option on right click)
2016-01-15 13:19:18 -05:00
Aurorablade
28a2980110 HALP HALP 2016-01-14 14:56:56 -05:00
Crazylemon64
de13a4e4d3 Various Ragin' Mages fixes
* Additionally, increases the number of memes in the codebase
2016-01-13 21:56:56 -08:00
Fox-McCloud
d1b90257c3 proper typecasting 2016-01-13 15:55:42 -05:00