TheDZD
fbbceac377
Merge pull request #1499 from Fox-McCloud/blob-update
...
[Ready To Merge!]Blob Mode Major Overhaul
2015-07-16 20:34:08 -04:00
Aurorablade
6f1a7605a0
Bay Light, Sprite move
...
added set light and moved spirtes back into mob.dmi
2015-07-14 09:12:23 -04:00
Aurorablade
2c677779d0
Adds cult glows to constructs taken from VG
...
will put in mob.dmi when i am SURE its not gonna conflict on me
2015-07-12 07:58:33 -04:00
Fox-McCloud
04511d3f0b
Blob Mode Major Overhaul
2015-07-12 02:45:40 -04:00
Fox-McCloud
36d714ec34
wip-flesh-to-stone-inclusion
2015-07-06 23:28:11 -04:00
Fox-McCloud
74bb52d48e
Cleans Up Icons
2015-07-06 22:47:18 -04:00
Fox-McCloud
c2567b92a8
Merge pull request #1414 from SamCroswell/martialarts
...
Thunderdome and Admin Room Changes
2015-06-30 16:55:10 -04:00
DZD
3c29805776
Gibson1027 Fluff items
...
- Bear pelt hat subtype that is instead a polar bear pelt that has its
edges covered in blood. This is missing a proper non-mob icon, currently
uses the default bear pelt hat, but shows up as the polar bear pelt on
mobs when worn.
2015-06-29 19:36:35 -04:00
Fox-McCloud
487332f9bf
Merge pull request #1413 from Ultimate-Chimera/Ultimate-Chimera
...
C.O.R.G.I AI Death Sprite Update.
2015-06-29 18:33:51 -04:00
SamCroswell
47c633a547
Adds the bo staff and a new martial art
2015-06-29 15:57:13 -04:00
Ultimate Chimera
4923281192
C.O.R.G.I AI Death Sprite Update.
...
I have decided to change my current death sprite from the default BSOD
sprite to the Alien AI death sprite from /tg/. (Same PR as before but I
messed up badly)
2015-06-29 00:26:31 -06:00
TheBeoni
6086b48f27
Brig Phys Jumpsuit Fix.
2015-06-28 19:34:42 +02:00
Fox-McCloud
d4779a873a
Merge pull request #1390 from FalseIncarnate/master
...
Prescription Glasses Upgrades and Sec Beret Sprite Fix
2015-06-27 17:45:09 -04:00
FalseIncarnate
be5f8b6ad3
Prescription Upgrades and Sec Beret Sprite Fix
...
Adds the ability to combine prescription glasses with a couple other
glasses
- Mesons + Prescription Glasses = Prescription Mesons
- You cannot upgrade the Night Vision Mesons with prescription glasses
- Sunglasses + Prescription Glasses = Prescription Sunglasses
- HUDSunglasses + Prescription Glasses = (NEW!) Prescription
HUDSunglasses.
Adds the ability to use a screwdriver to disassemble (separate) the
above upgraded glasses.
- Returns the prescription glasses and the
mesons/sunglasses/HUDSunglasses
Also fixes the sprite for the north-facing Security Officer Beret
randomly having some orange pixels.
2015-06-25 19:54:38 -04:00
ZomgPonies
dd5112cfc7
Merge pull request #1382 from TheDZD/master
...
Anxipal Fluff Item
2015-06-25 19:00:18 -04:00
Fox-McCloud
b740f8930e
Merge pull request #1377 from Robertha89/master
...
Definitely Not Ian
2015-06-25 02:31:14 -04:00
TheDZD
9943a26c91
Merge pull request #1326 from Fox-McCloud/revenants
...
Revenant
2015-06-24 17:48:18 -04:00
DZD
9d4ffb7884
Anxipal Fluff Item
2015-06-24 14:02:42 -04:00
Fox-McCloud
02aaca9c7b
Merge remote-tracking branch 'upstream/master' into revenants
2015-06-23 23:44:20 -04:00
Robertha89
b7e43286a6
New hat for Ian and new tool for pets
...
while life serve the same function, it is somewhat difficult to make,
the lazarus injector revives any neutral simple_animal on use, and can
turn hostile animals friendly towards them if it has been emped. so five
of those has been added to the crittercare.
Most importantly, Ian got a new mask, the mustache.
2015-06-24 04:37:48 +02:00
Fox-McCloud
d121ccfc76
Fox--Custom Items
2015-06-19 22:18:22 -04:00
ZomgPonies
b2e821ebb0
Fixes fancy uniform
2015-06-18 16:24:04 -04:00
Fox-McCloud
36b7e7b233
Merge pull request #1333 from SamCroswell/NinjaDev
...
EKatana Changes, Removes Ninja Eye Implant
2015-06-18 01:02:17 -04:00
Fox-McCloud
cbc9458379
Merge pull request #1331 from TheBeoni/Brig-Phys
...
Brig Doctor Jumpsuit.
2015-06-17 23:02:06 -04:00
SamCroswell
cf59967c86
Adds EKatana Belt Icon
2015-06-17 00:07:02 -04:00
Fox-McCloud
75e68e618d
Merge pull request #1325 from Nienhaus/master
...
Adds Deer ;D
2015-06-16 21:18:06 -04:00
TheBeoni
fd4c40fcf9
Added brig physician jumpsuit. Brig Physician spawns with one, i also put one spare into locker.
2015-06-17 02:11:01 +02:00
Nienhaus
061a484016
Makes deer dead sprite upside down.
2015-06-15 19:50:53 -05:00
Nienhaus
060318cb29
Adds Deer ;D
2015-06-15 18:50:39 -05:00
ZomgPonies
9a6ac0e44a
Adds in new fancy uniform for events
2015-06-15 11:05:06 -04:00
Fox-McCloud
8a78887ba6
Blueshield Jacket Re-submission
2015-06-14 14:23:55 -04:00
Robertha89
662a101bce
adds xeno fat suit
2015-06-14 09:12:40 +02:00
Fox-McCloud
09097b38ed
Revenant
2015-06-13 20:10:02 -04:00
SamCroswell
4e3f4bfa17
Adds Vision Flags for Helmets
2015-06-11 23:15:42 -04:00
Fox-McCloud
7b455d8b89
Re-Works Maintenance Loot
2015-06-04 18:53:13 -04:00
Fox-McCloud
e71bcdb9d0
Adds Grenade, Flash, and EMP in-hands
2015-05-31 16:39:41 -04:00
TheDZD
38d3eeaa31
Merge pull request #1206 from ZomgPonies/piecannon
...
Adds Piecannons to HONKsquad
2015-05-29 17:41:18 -04:00
ZomgPonies
277a900aa7
Merge pull request #1193 from Fox-McCloud/mobs-pets-stuffs
...
Simple Animal Refactor+Update+Fixes and Pet Collars
2015-05-28 22:45:03 -04:00
Fox-McCloud
4990899123
Merge pull request #1188 from tigercat2000/mobsize
...
-tg- Mob Size & Refactors
2015-05-28 19:19:12 -04:00
ZomgPonies
8bfc376886
Add pie cannons to HONKsquad
2015-05-28 17:44:56 -04:00
ZomgPonies
52e8720bd8
Merge pull request #1195 from Fox-McCloud/wolpin-fix
...
Wolpin Fix+Monkey Tail Fix
2015-05-28 12:34:17 -04:00
Fox-McCloud
cd112b5364
Wolpin Fix+Monkey Tail Fix
2015-05-28 04:04:39 -04:00
ZomgPonies
613ae3f552
Merge pull request #1191 from TheFlagbearer/TheFlagbearer-Arachnomask-quickfix
...
Theflagbearer arachnomask quickfix
2015-05-28 01:18:00 -04:00
Fox-McCloud
5d3e837b4a
Mob Refactor+Update and Pet Collars
2015-05-28 00:20:25 -04:00
TheFlagbearer
a88240c2ce
Quickfix for the Arachno-Man Mask
...
I know this is my fourth PR regarding this item but bear with me. It's
been 4 days since I started doing this stuff.
My previous PR fixed everything EXCEPT for the mask, which remained the
same. This fixes that.
2015-05-27 21:10:17 -04:00
ZomgPonies
c024764b10
Merge pull request #1179 from TheFlagbearer/revert-1158-Theflagbearer-customitems
...
The Flagbearer - Custom Item Fixes
2015-05-27 19:39:58 -04:00
Tigercat2000
581521daae
Refactor Alien icons to get rid of nasty laying layer.
2015-05-27 16:39:35 -07:00
TheFlagbearer
c3deedf036
Fixes merge conflict
2015-05-27 16:46:44 -04:00
FalseIncarnate
a1cce51559
Merge Conflict Fix, Attempt 2
2015-05-27 01:07:19 -04:00
TheFlagbearer
b24c1a783f
Item sprites and defines
...
Fixes the Arachno-Man items. Hopefully doesn't cause a merge conflict.
If it does, I'll be forced to leave this PR open until someone helps out
or it's closed by a Senior Admin.
2015-05-26 21:32:42 -04:00