cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-14 02:43:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,275 Commits 62 Branches 14 Tags
d524b4acdeaa574f63503c8212184c5e7e94de84
Commit Graph

141 Commits

Author SHA1 Message Date
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
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
bear1ake
f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
xxalpha
70d97ad5e4 Fixed a couple of bugs with cable coils. 2015-09-01 22:35:04 +01:00
duncathan
51c09f16bf makes all Destroy()'s return properly 2015-08-31 00:21:01 -06:00
phil235
d211992ddc Make it so the code doesn't rebuild (propagate_network()) the wire network X times when singulo/explosion destroys a line of X cables at once. 2015-08-25 20:22:30 +02:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
Ikarrus
b7df175981 Update 2015-07-08 21:31:23 -06:00
Ikarrus
20361faf02 Makes augmentations more difficult to maintain 
Medical has had several overhauls, but none of them touched augmentations, so they became almost a no-contest better alternative than regular limbs in virtually every aspect.

- Repairing yourself is no longer instant, and will take longer than healing than biological medical items.
- EMP damage increased from basically nothing to actually dangerous
 2015-07-08 21:12:44 -06:00
xxalpha
cfb5e724b6 Material container, all items can have materials, wake me up 
cant wake up

go to sleep debug
 2015-07-01 03:34:47 +01:00
Cheridan
46acc2a55d REMOVES CABLE CUFF 2015-06-06 16:21:41 -05:00
Firecage
f79e0fc1aa Updates more paths, for example obj/stuff to /obj/stuff 2015-05-31 17:48:33 +02:00
xxalpha
ba823213d2 Added ability for cyborgs to pick their cable coil color. 2015-05-03 00:43:21 +01:00
xxalpha
638ccf8503 Changed engineering cyborg cable coils to be randomly colored. 2015-05-02 23:10:53 +01:00
kingofkosmos
3304ffa45f span fixes 2015-04-24 20:52:01 +03:00
kingofkosmos
1d14471d00 Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark. 2015-04-24 20:50:50 +03:00
xxalpha
13e291a4e9 Merge remote-tracking branch 'upstream/master' into catwalkmachines 
Conflicts:
	code/game/turfs/turf.dm
	code/modules/power/power.dm
 2015-03-06 19:19:09 +00:00
xxalpha
15dacd50b1 Replaces cancable var with two new procs. 
Clean up.
 2015-02-21 20:15:03 +00:00
Remie Richards
5fc7af7fbf attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite. 
Items reset their pixel_x and pixel_y values on pickup.
 2015-02-19 13:02:43 +00:00
paprka
0e4903bd83 Merge branch 'master' of https://github.com/tgstation/-tg-station into walkthecat 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2014-12-26 18:35:12 -08:00
paprka
3ca6d769a1 adds catwalks 2014-12-26 17:38:55 -08:00
paprka
3f41ca1a9a further code optimizations in cable.dm 2014-12-26 09:26:56 -08:00
paprka
404da4dbdd code optimizations 2014-12-25 13:28:05 -08:00
paprka
a6acdeb3c2 initial commit 2014-12-25 13:07:06 -08:00
Razharas
7758a0afed Ok now explosions shall work properly 
Changed severity to target, make items not destroy themselves on
severity lower than 1, all that stuff
 2014-12-05 23:21:48 +03:00
Razharas
84e69cff6b Conflict resolve 
Damn cables
 2014-11-24 12:27:53 +03:00
Menshin
56bd52e95b Fixed cutting cables always spawning a single red cable 2014-11-22 15:59:18 +01:00
Razharas
ff456ebaf4 Unwinded most of shit 
Meh
 2014-11-19 21:36:45 +03:00
Razharas
b071a0167e Made explosions work in a slightly different way 
Yep
 2014-11-18 16:22:41 +03:00
Cheridan
df13b0d840 Merge pull request #5591 from hornygranny/OOPgularity3 
improved deconstruction, singularity stuff
 2014-11-03 20:20:55 -06:00
phil235
128c9222e5 Adding checks for stun, restrained to many object verbs. 
Fixing paper and supply manifest description upon examination.
Fixing being able to adjust jumpsuit while restrained.
Fixing one typo.
 2014-11-01 19:18:01 +01:00
Hornygranny
955847de74 defines 2014-10-31 19:00:50 -07:00
Hornygranny
c29526ee2f destruction proc, cable deconstruction 2014-10-31 17:01:28 -07:00
paprka
d61e4ac943 big commit, handcuff overhaul 2014-10-08 13:19:54 -07:00
Cheridan
f96b017149 Merge pull request #5097 from phil235/Msg1Fix 
Fixing a lot of messages
 2014-10-07 12:09:01 -05:00
phil235
537280b4b9 Removing many instances of the no longer used second argument of message_admins() proc. 
Replacing "for(var/mob/M in viewers()) M.show_message()" by "visible_message()" or audible_message()" in many places.
Changing a few span classes.
 2014-10-05 01:29:30 +02:00
MrPerson
651c3e6db5 Merge to master - sole conflicting file was ninja.dm FUCK NINJAS 2014-10-04 01:45:39 -07:00
Alex
837d5bc7eb Merge pull request #4456 from Ikarrus/table_prints 
Fingerprints for Cables and Tables
 2014-08-31 17:11:14 +01:00
MrPerson
a23dbe2357 Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor 
Conflicts:
	code/game/objects/items/devices/radio/radio.dm
	code/game/objects/items/toys.dm
	code/game/objects/items/weapons/tanks/tank_types.dm
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/events/ninja.dm
	code/modules/power/cell.dm
	code/modules/power/port_gen.dm
	code/modules/reagents/reagent_dispenser.dm
 2014-08-29 04:21:15 -07:00
Firecage
0948391502 Span classes for files in the following Modules folders: Power, Projectiles, Reagents, Recycling, Research 2014-08-23 02:02:46 +02:00
MrPerson
44383ec1c8 Disregard that I suck cocks 2014-08-21 07:35:51 -07:00
MrPerson
d0c97aae72 Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor 
Conflicts:
	code/ATMOSPHERICS/components/unary/vent_pump.dm
	code/game/gamemodes/cult/ritual.dm
	code/game/gamemodes/nuclear/pinpointer.dm
	code/game/machinery/spaceheater.dm
	code/game/machinery/status_display.dm
	code/game/objects/effects/decals/crayon.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/items/weapons/airlock_painter.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/items/weapons/storage/secure.dm
	code/game/objects/items/weapons/tanks/tank_types.dm
	code/modules/assembly/assembly.dm
	code/modules/assembly/holder.dm
	code/modules/assembly/mousetrap.dm
	code/modules/mob/living/carbon/alien/special/facehugger.dm
	code/modules/mob/living/carbon/slime/examine.dm
	code/modules/power/cable.dm
	code/modules/reagents/grenade_launcher.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/modules/recycling/sortingmachinery.dm

Thanks Firecage, this is all your fault
 2014-08-20 05:54:20 -07:00
ikarrus
cb27ad34a6 Cutting cables, too 2014-08-15 19:50:09 -06:00
Menshin
b158820043 Fix merging powernet on turf sometimes not connecting machines. 2014-07-02 19:01:11 +02:00
Menshin
c6c8c58ef7 Machines de/connecting from/to a powernet will now always call the connect_to_network/disconnect_from_network procs instead of de/connecting directly. 2014-07-01 18:54:41 +02:00
Kelenius
a8b7588c12 Merge branch 'master' of https://github.com/tgstation/-tg-station into Temp 
Conflicts:
	code/game/objects/items/weapons/grenades/ghettobomb.dm
	code/game/objects/structures/door_assembly.dm
 2014-06-19 02:27:10 +04:00
MrPerson
c43518351f Some fixes and minor improvements to examining. 2014-06-13 09:01:52 -07:00
Kelenius
3908160998 One big update for stacks. 2014-06-10 20:36:08 +04:00
MrPerson
645ca7f8a1 Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor 
Conflicts:
	code/_onclick/click.dm
	code/game/atoms.dm
	code/game/objects/items/toys.dm
	code/modules/paperwork/folders.dm
	code/modules/power/cable.dm
 2014-06-09 01:50:44 -07:00
Rockdtben
569d12facf Moved item_heal_robotic out of obj/item and into mob_helpers.dm 2014-06-05 19:25:08 -05:00