Commit Graph

405 Commits

Author SHA1 Message Date
KorPhaeron d8a37204e7 Makes burn_state use defines 2015-12-13 05:36:55 -06:00
Cheridan 0979b72d29 Merge pull request #13554 from bgobandit/banditfixyourshit
More mining fixes and tweaks.
2015-12-12 18:18:18 -06:00
bgobandit 01dd491390 Fixes various mining bugs. Adjusts gear costs. 2015-12-10 14:43:33 -05:00
KorPhaeron 755455c9de New sprite 2015-12-10 01:36:27 -06:00
KorPhaeron 8f01581fc0 Updates to use variables 2015-12-07 18:28:36 -06:00
KorPhaeron c9330c5ef0 Chasm 2015-12-05 02:35:33 -06:00
KorPhaeron b8909aa814 Fixes the pre-mapped cave pieces to spawn the right tiles 2015-12-03 16:07:00 -06:00
KorPhaeron 0e4078fb90 Mine turf fixes 2015-12-03 14:25:38 -06:00
KorPhaeron 2600371fe0 Updates mine turfs to be slightly more modular 2015-11-28 18:49:40 -06:00
KorPhaeron 99df1d798d New mining turfs 2015-11-27 22:10:07 -06:00
Cheridan 762568255d Merge pull request #13102 from bgobandit/newmininggear
Various mining additions, fixes, nerfs and buffs (ready for review/merge).
2015-11-26 18:11:26 -06:00
bgobandit f435f18d6b fixed gunhog's shit, added new KA/res to asteroid rooms, added mesons to mech scanner 2015-11-24 07:18:54 -05:00
bgobandit bcd456eea1 Added new PKA, R&D designs, tweaked numbers, honked the honk up the honk 2015-11-23 18:44:54 -05:00
bgobandit 2fd13edef2 Adds hivelord stabilizer. Fixes a bug. 2015-11-18 22:04:01 -05:00
bgobandit b928b8ec18 fixes memestation, ups ore points slightly 2015-11-18 19:51:49 -05:00
bgobandit bb397fcc0d fixes bluespace crystal related bug 2015-11-18 19:32:20 -05:00
bgobandit 47dcbc2fd0 Various mining additions, fixes and rebalances. 2015-11-18 19:14:28 -05:00
Incoming 1f9f0dfc40 Adds subtypesof(). It's shorthand for typesof(path) - path.
Replaces typesof(path) - path with subtypesof(path) in obvious places. I was a bit conservative, there's probably a few more places that could use this.
2015-11-16 18:55:57 -05:00
phil235 d3ee910211 Makes effect system code more OOP.
obj/effect/effect is now renamed obj/effect/particle_effect for better usability.
datum/effect/system and /datum/effect/effect/system are now both /datum/effect_system.
Fixes a bug where wall mounted igniters (and other spark producing objects) didn't produce sparks sometimes.
Moved explosion_particles.dm into the effect_system folder, because it has effect_systems code.
2015-10-21 23:28:29 +02:00
xxalpha e82a216447 Changed various instances of range() and orange() to ultra_range(). 2015-10-19 20:04:14 +01:00
phil235 9c79257aab Changes the paths of stools, beds and chairs. It is now obj/structure/bed/chair and obj/structure/bed/stool. It makes much more sense since stools barely have any code of their own.
Beds (and chairs) now have buildstacktype and buildstackamount vars to handle how many sheets of what they should drop on deconstruction.
They also have a foldabletype var to handle folding into item (currently only used by roller beds) so that people can add foldable chairs in the future.
Fixes swivel chairs not dropping the correct amount of metal sheets.
2015-10-10 13:35:00 +02:00
Razharas ed7802599c Merge pull request #12208 from xxalpha/smoothballs
Fixed asteroid rock edging breaking wall smoothing.
2015-10-10 03:23:10 +03:00
xxalpha 7c98cb54e3 Fixed asteroid rock edging breaking wall smoothing. 2015-10-07 12:01:01 +01:00
Xhuis 25621e29fc VOMIT GENERALIZATION 2015-10-04 17:09:07 -04:00
xxalpha deb60ae309 Replaced /proc/is_sharp() with /obj/item/proc/is_sharp(). 2015-09-24 03:08:28 +01:00
Remie Richards 82a79a1705 Merge pull request #11787 from bgobandit/theywanttherandd
Adds origin tech values to a lot of items.
2015-09-19 14:20:09 +01:00
bgobandit aac0dd4d22 Adds origin tech values to a lot of items. 2015-09-14 14:27:01 -04:00
c0 77787688ec fix 2015-09-13 23:47:03 +03:00
c0 75f2c92ebc Adds materials to ore 2015-09-13 23:37:13 +03:00
Fox-McCloud 9b668de7bb Merge remote-tracking branch 'upstream/master' into Impropermaterials 2015-09-13 08:58:40 -04:00
Jordie 15e50de0fe Merge pull request #11694 from bear1ake/point-zero
Remove a bunch of useless .0 in vars
2015-09-13 21:47:09 +10:00
Jordie 6c8bb6f518 Merge pull request #11632 from bgobandit/dirtymininglies
Fixes asteroid turfs showing up as "mineral deposit."
2015-09-13 21:45:56 +10:00
bear1ake c52c4a5346 Merge remote-tracking branch 'tgstation/master' into point-zero
Conflicts:
	code/modules/research/protolathe.dm
2015-09-12 21:07:40 +09:00
Fox-McCloud 89fa65c127 Fixes Consistency Issue with Materials 2015-09-12 03:51:33 -04:00
bear1ake f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
bgobandit b3b9941432 Merge branch 'master' of https://github.com/tgstation/-tg-station into matsblastusa
Conflicts:
	code/modules/assembly/flash.dm
2015-09-09 14:04:41 -04:00
Razharas 161156cffc Merge pull request #11585 from bgobandit/legitposters
Poster changes!
2015-09-09 02:38:56 +03:00
xxalpha 5adb732a66 Changed asteroid plating singularity pull to do nothing.
Changed singularity act on asteroid plating to do nothing.:
2015-09-08 15:59:35 +01:00
bgobandit c74796b317 Fixes asteroid turfs showing up as "mineral deposit." 2015-09-07 10:12:39 -04:00
bgobandit c5984f4359 Merge branch 'master' of https://github.com/tgstation/-tg-station into legitposters
Conflicts:
	_maps/map_files/MetaStation/MetaStation.v41G.dmm
2015-09-06 13:27:51 -04:00
bgobandit 261494e659 Made some changes and repathing for posters. 2015-09-04 18:30:58 -04:00
c0 df7386a4ec Assemblies update 2015-09-04 11:22:37 +03:00
bgobandit d23f2cb622 mats for toolboxes, glasses and flashes; adjusts coin amounts up slightly 2015-08-31 12:14:34 -04:00
bgobandit 084965803a Circuit boards now give glass, not gold. Adds materials to AI modules and coins. 2015-08-31 09:37:44 -04:00
xxalpha 3f29a9866c Merge remote-tracking branch 'upstream/master' into qdelFixes
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
2015-08-31 08:52:30 +01:00
xxalpha b9db8ce854 A few qdel fixes. 2015-08-27 13:15:41 +01:00
xxalpha 19947d4fa0 Added qdel(wires) to a bunch of objects Destroy proc.
Return ..()
2015-08-27 11:10:58 +01:00
Cheridan d7eca4f327 Merge pull request #11340 from phil235/CoinFlipThrowFix
Fixes the do_after progress bar appearing on a coin when flipping+throwing it
2015-08-27 01:00:01 -05:00
Cheridan 3278a3926b Merge pull request #11358 from phil235/XenoFeatures1
Facehugger inhands, xeno tweaks, and monkey bugfixes
2015-08-26 07:52:31 -05:00
phil235 cb1cd5b1e7 Monkey and aliens now all use carbon/examine().
Fixes monkeys being able to strip and uncuff people while handcuffed themselves.
Add an inhand sprite for facehuggers (taken from Xhuis) (but they don't appear for large queens, it'd look ugly).
Xenos now regenerate plasma on alien weed even when injured but at half the normal rate.
Moved queen/large/update_icons() to humanoid/update_icons.dm
2015-08-24 17:07:09 +02:00