Commit Graph

3483 Commits

Author SHA1 Message Date
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
TheDZD
0ff97aa42e Merge pull request #1522 from Fox-McCloud/fixin-dat-thing
Power Computer and Computer Fixes
2015-07-15 19:43:59 -04:00
Fox-McCloud
5882cdf1e9 Merge pull request #1512 from Aurorablade/CultistRave
[Sprites]Cultist rave AkA 'Fethas Stop making pull requests!'
2015-07-15 09:07:42 -04:00
Fox-McCloud
409fefa4b3 Power Computer and Computer Fixes 2015-07-15 07:00:46 -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
Fox-McCloud
822dc6bac1 solar tweaks 2015-07-14 00:23:58 -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
ead7fba88c update 2.0 2015-07-08 21:44:26 -04:00
Fox-McCloud
2b842d1330 Laser Projectile Sprite Changes 2015-07-08 21:33:08 -04:00
ZomgPonies
8d5d97bd45 Merge pull request #1468 from SamCroswell/computerupdate
Computer Lighting Update
2015-07-08 02:23:58 -04:00
ZomgPonies
e280d41a45 Merge pull request #1465 from Fox-McCloud/cleanup-of-stuff
Cleans Up Icons
2015-07-08 02:21:36 -04:00
SamCroswell
1d670c4c0f Computer Lighting Update 2015-07-07 01:10:55 -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
Tigercat2000
997d616b62 Minigibber toy
This commit adds a miniature gibber toy (/obj/item/toy/minigibber), which
uses a downscaled sprite of the gibber.

Features:
 - Plays a gibbing noise when you click on it with itself, cooldown of 8
   ticks applies.
 - It's a miniature gibber.
 - Custom attack verbs (grinded, gibbed)
 - Feed DnD minifigures into it for REALISTIC GIBBING ACTION (tm)
 - Obtain from arcade machine or cargo store (400 credits)

** SQUASHED COMMITS **

Minigibber name-spellchecking

Protip: Miniature is actually spelled mini-ature, not min-ature.

Minigibber minifigure eating action!

You can now shove minifigures into the Minigibber, then click on it with
itself to tear them apart! GIB! GIB! GIB!

Make minigibber obtainable

Via arcade machine and cargo store (400 credits)

Minigibber desc now says grinder...

instead of meat producing machine. Because it's really just a giant
grinder, and that will match the store item description.

Readd gibbing sound to minigibber, mistakenly removed it earlier.
2015-07-06 17:15:54 -07:00
Fox-McCloud
7b9a86ad08 New Title Screen 2015-07-02 17:29:05 -04:00
ZomgPonies
7df2c7e71d Merge pull request #1427 from Fox-McCloud/supermatter
TG Supermatter Port
2015-07-01 23:49:19 -04:00
TheDZD
c05d218783 Merge pull request #1424 from Fox-McCloud/phoron-is-for-morons
Phoron is for morons
2015-07-01 17:54:33 -04:00
Fox-McCloud
62ef1cb7e2 TG Supermatter Port 2015-06-30 21:07:08 -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
Fox-McCloud
da25b9af32 go the hell away, no one liked you anyway 2015-06-30 01:12:24 -04:00
DZD
2d1242b5da Sprite update 2015-06-29 20:13:03 -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
ZomgPonies
a0147487c8 Merge pull request #1369 from Fox-McCloud/fox-fluff
Custom Item: Fox P McCloud
2015-06-24 13:00:58 -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
b2837f6023 tweaks, update 2015-06-22 22:41:58 -04:00
Tigercat2000
7c9139d6e0 Bay/-tg- Meteor port
Meteors now have different types, properly integrated.
Meteoract has been removed, meteors now just call ex_act.
2015-06-21 18:39:39 -07:00
Fox-McCloud
5f2f3f6789 Merge pull request #1343 from tigercat2000/DidntIsayIamGoingtoStopThisstuff
Window spawners + Adding to map
2015-06-19 22:19:37 -04:00
Fox-McCloud
d121ccfc76 Fox--Custom Items 2015-06-19 22:18:22 -04:00
Fox-McCloud
ada66fabd4 Update II 2015-06-18 17:47:52 -04:00
ZomgPonies
b2e821ebb0 Fixes fancy uniform 2015-06-18 16:24:04 -04:00
Tigercat2000
654cb37e9a Window spawners + Adding to map
This commit adds window spawners, mapping tools which either spawn full
windows or automatically detect where it should place each pane.
2015-06-18 12:33:12 -07: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
Fox-McCloud
91e1a39cb8 Removes Phallic Icons 2015-06-17 16:36:32 -04:00
TheDZD
2a3183dc05 Merge pull request #1320 from ZomgPonies/graffiti
Adding new graffiti types
2015-06-17 16:15:21 -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