Commit Graph

2202 Commits

Author SHA1 Message Date
Fox-McCloud
409fefa4b3 Power Computer and Computer Fixes 2015-07-15 07:00:46 -04:00
Fox-McCloud
822dc6bac1 solar tweaks 2015-07-14 00:23:58 -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
SamCroswell
1d670c4c0f Computer Lighting Update 2015-07-07 01:10:55 -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
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
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
SamCroswell
47c633a547 Adds the bo staff and a new martial art 2015-06-29 15:57:13 -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
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
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
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
Fox-McCloud
ed6f675ffb Merge pull request #1321 from ZomgPonies/elpresidente
Adds in new fancy uniform for events
2015-06-16 16:30:48 -04:00
ZomgPonies
b5bf126222 Merge pull request #1317 from Fox-McCloud/lampsssss
Moveable Desklamps
2015-06-16 08:02:27 -04:00
ZomgPonies
9a6ac0e44a Adds in new fancy uniform for events 2015-06-15 11:05:06 -04:00
Fox-McCloud
bea4974d72 Moveable Desklamps 2015-06-14 22:34:04 -04:00
Fox-McCloud
8a78887ba6 Blueshield Jacket Re-submission 2015-06-14 14:23:55 -04:00
ZomgPonies
f70106a344 Merge pull request #1295 from FalseIncarnate/master
[Feature][Sprites][Map Edit] Aquariums and Pet Rocks!
2015-06-13 04:21:07 -04:00
ZomgPonies
35f04b0b53 Merge pull request #1298 from Fox-McCloud/guitar-icon
Guitar Icon Update
2015-06-13 04:17:26 -04:00
FalseIncarnate
25b9283717 Feedback Fixes
Changes instances of \red and \blue to use spans as per suggestions in
glass.dm and fishtank.dm

Fixed a mistake preventing the building of one direction windows and
fishbowls (whoops!)

Fixes grammar concerns in multiple messages

Holy water is now (magically?) worth 110% of it's reagent amount when
filling aquariums.
- This is a rather small boost to having the chaplain bless the water
you are going to dump into a filtration system anyways.

Moves the fishwater ingestion method out of the on_mob_life proc to
prevent spam, now will display when initially ingested

Updates the CritterCare vendor's sprite to include the pug and fox, as
well as adjusting the "static" between displays to give it a slight
variety.
2015-06-13 04:13:47 -04:00
Fox-McCloud
1641550845 Guitar Icon Update 2015-06-12 21:19:24 -04:00
FalseIncarnate
9074629123 Aquariums and Pet Rocks!
Adds fishbowls, fish tanks, and wall aquariums.
- Buildable with glass
- Fish Tanks and Wall Aquariums also have built-in lights that can be
toggled
- Wall Aquariums block atmos just like a full window or wall.

Adds fish and fish/aquarium related items:
- Goldfish, Clownfish, Sharks, and Baby Space Carp
- Eggs can be obtained for each of these fish types and a dud egg type.
- Fish food, fish nets, egg scoops, tank brushes
- These are used to maintain your aquarium

Adds new vendor: CritterCare!
- Sells pet supplies and pet rocks!
- Moved pet collars from the clothing machine into the CritterCare

Adds new room/area: Pet Store!
- Located between the Port Emergency Storage and Auxilary Tool Storage
(across from the Vault)
- Contains a CritterCare machine, 2 fishbowls, a bucket, and a sink

Adjusts some Cargo order options!
- New category: Vending
- Contains all the vending machine refill crates
- Renamed the Bartending Supply Crate to Bar Supply Crate to avoid
confusion
- Removes the coffee refill canisters from the Bar Supply Crate, placed
them into the new Coffee Supply Crate
- Adds new Clothing Supply Crate, contains refill canisters for the
Hatlord 9000, Suitlord 9000, Shoelord 9000, and ClothesMate vendors
- Adds new Pet Supply Crate, contains refill canisters for the new
CritterCare vendor

Makes the ClothesMate and CritterCare vendors constructable
- Using a screwdriver on a vendor circuitboard will now have a chance to
set it to the ClothesMate or CritterCare setting, in addition to the
previously possible settings like Booze-o-mat and Shoelord 9000.
New reagent: Fishwater
- Obtained by using an empty reagent_container on any aquarium that has
some water in it.
- Ingesting fishwater has a 30% chance per cycle to make you vomit (what
did you expect from dirty water and fish poo?)
- Fishwater is good for botany, as it provides both water and nutrients
to hydro trays

ADDITIONAL FIXES!
- Fixes the abandoned bar's misaligned area (mostly a mapper thing, will
also ensure an APC in the area will properly power the entire area (and
not space)
- Fixes a couple instances of piping mistakes where there were manifolds
and straight pipes on the same tile, preventing vent-crawlers from being
able to navigate properly
- One was in security, another was the back room of hydroponics
- Fixed a missing pipe in the AI upload causing the vent to be
disconnected from the pipe network
2015-06-12 04:14:28 -04:00
SamCroswell
4e3f4bfa17 Adds Vision Flags for Helmets 2015-06-11 23:15:42 -04:00
Fox-McCloud
eb64e3ea05 Icon and Sound Cleanup 2015-06-06 09:38:10 -04:00
Tigercat2000
74f304e88c Metastation: Compatibility modifications
This commit modifies metastation to actually be playable on our code
Squashed Commits:
 - [META] Fixes emergency shuttle being stuck
 - Toxins Mixing fix: chamber floor > engine
 - Adds research outpost + Chem lab to routpost
 - Add vox raider ship, fix pods and a few shuttle zones.
 - Remove step_x so TRAVIS likes it
 - Finish spawn points, add telepad.

 - Replace showroom with NT-rep/Blueshield Office
   Don't worry, the nuke keg is in the meeting room.
 - Convert art storage to barber shop, place artvend in tool storage
 - Buncha medbay tweaks, 2nd surgery table, body scanners, fixed sleepers,
   minor balance changes.
 - Add Mr. Changs to dorms
 - Update meta to latest paracode
 - Fix punpun
 - Atmos volume pumps, atmos control console
 - Add chicken statue to Mr. Chang's (*cry), Bar smartfridge
 - Fix mr. changs statue and chairs
 - Add togglable polarized windows to surgery, so surgeons can prevent seeing
   other surgery procedures if necessary
 - Actually add atmos control comp
 - Hydro trays are no longer dirt
 - Fix brig windoors
 - Fix escape shuttle sleepers
2015-06-04 19:28:45 -07:00
ZomgPonies
97fadbede5 Merge pull request #1237 from Fox-McCloud/barsigns
Refactors Barsigns
2015-06-01 19:42:41 -04:00
Fox-McCloud
866de52f0f SNIP 2015-05-31 22:32:20 -04:00
Fox-McCloud
bbed6a2a42 Refactors Barsigns 2015-05-31 20:04:12 -04:00
Fox-McCloud
e71bcdb9d0 Adds Grenade, Flash, and EMP in-hands 2015-05-31 16:39:41 -04:00
ZomgPonies
e5f026d02e Merge pull request #1216 from tigercat2000/OHGODIHAVETOTESTTHIS
Port Atlas's implementation of -tg-'s canvas art.
2015-05-30 20:17:41 -04:00
ZomgPonies
01896f9209 Merge pull request #1208 from tigercat2000/coloredtilelight
Colored Light Tiles
2015-05-29 19:36:56 -04:00
Tigercat2000
cced767094 Port Atlas's implementation of -tg-'s canvas art. 2015-05-29 15:43:42 -07:00
ZomgPonies
e7f38b2e5c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into chingchong
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
2015-05-29 17:53:07 -04:00
TheDZD
38d3eeaa31 Merge pull request #1206 from ZomgPonies/piecannon
Adds Piecannons to HONKsquad
2015-05-29 17:41:18 -04:00
Tigercat2000
f7ccb2ef79 Colored Light Tiles
Light tiles (item) can now have their color changed by attacking them with a
multitool. These colors have special sprites and glow a color similar to
their sprite.
2015-05-28 16:52:06 -07:00
ZomgPonies
8bfc376886 Add pie cannons to HONKsquad 2015-05-28 17:44:56 -04:00
ZomgPonies
15cfa99edc Adds chickenman and clown statues 2015-05-28 15:55:55 -04:00
Fox-McCloud
5d3e837b4a Mob Refactor+Update and Pet Collars 2015-05-28 00:20:25 -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
TheFlagbearer
a65e0bca7e Real merge fix
Merge conflicts aren't my strong suit.
2015-05-27 16:51:00 -04: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