Fox-McCloud
1ff23cd3ca
lesser summon guns, wizman update
2016-01-29 09:12:37 -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
Crazylemon
9099116ae7
Ais can now hear their radio again
2016-01-25 10:12:42 -08:00
Fox-McCloud
fff0590492
Merge remote-tracking branch 'upstream/master' into knife-refactor-cargo-swat
2016-01-23 18:04:02 -05:00
Fox-McCloud
14a2022ef4
sword
2016-01-23 07:29:36 -05:00
Fox-McCloud
f5220f7ce3
Assault Surplus Create and Knife Refactor
2016-01-22 10:04:24 -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
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
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
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
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
Aurorablade
53222772bc
i almost want to give up on this
2016-01-13 03:37:45 -05:00
Aurorablade
602d4c1c2f
what am i even doing...
2016-01-12 16:22:42 -05:00
Fox McCloud
a2f944cfd9
Merge pull request #2722 from ZomgPonies/russian
...
Revolver Stuff
2016-01-11 00:18:21 -05:00
Fox-McCloud
df75c3418d
tweak
2016-01-09 21:19:20 -05:00
Fox-McCloud
a2e825603e
Adds in Tradable Telecrystals
2016-01-09 17:42:03 -05:00
TheDZD
82b12d1a34
Merge pull request #3164 from Fox-McCloud/uplink-fixes
...
Uplink and Syndicate Cyborg Fix
2016-01-08 17:28:40 -05:00
Fox-McCloud
a21d1b5221
Uplink and Syndicate Cyborg Fix
2016-01-08 17:07:33 -05:00
Fox McCloud
96f38d0ccd
Merge pull request #3120 from Tastyfish/nano-piano
...
Instrument UI updated to modern nanoui.
2016-01-06 03:45:43 -05:00
Tigercat2000
986c687d27
Merge remote-tracking branch 'upstream/master' into lighttiles
...
Conflicts:
code/game/objects/items/stacks/tiles/tile_types.dm
2016-01-05 18:49:36 -08:00
Tigercat2000
a10d7d1bd2
fix lightfloors
2016-01-05 18:46:39 -08:00
TheDZD
3d316d9c66
Merge pull request #3116 from Fox-McCloud/slipping-floors
...
Slippery Refactor and Floors
2016-01-05 21:42:26 -05:00
TheDZD
73f6114b1f
Merge pull request #3112 from Fox-McCloud/object-verb-restore
...
Restores a Few Object Verbs
2016-01-05 19:35:55 -05:00
Tastyfish
65e2a7fdff
Updates/fixes instrument ui to be a nanoui
2016-01-05 02:26:45 -05:00
Fox-McCloud
4221d033ab
Slipping Refactor and Floors
2016-01-04 21:22:59 -05:00
Fox-McCloud
a7d1bcce4e
Restores a Few Object Verbs
2016-01-04 16:42:53 -05:00
Crazylemon
b06d542d50
Fixes a flipped conditional that made welders unreadable
2016-01-04 10:10:50 -08:00
Fox McCloud
103372e92b
Merge pull request #3037 from KasparoVy/master
...
Adds Body Marking Customization, Head Accessories, Revises Unathi Customization, Related Minor Fixes, etc.
2016-01-03 22:33:40 -05:00
Fox McCloud
9c863e5259
Merge pull request #3092 from tigercat2000/tgsmooth
...
-tg- Smoothing/Floor refactor
2016-01-03 22:28:50 -05:00
Tigercat2000
31aab5452b
-tg- smoothing/floor refactor
...
Squashed:
Add plasteel goonplaque turf
Builtin_tile nulling
Levelupdate()
Fix falsewalls, update smoothing.dmm
fixes rwall decon
2016-01-03 19:24:13 -08:00
TheDZD
6ec065b319
Merge pull request #3102 from Fox-McCloud/ert-fix
...
ERT Medical Belt Fix
2016-01-03 21:38:15 -05:00
