cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-18 13:04:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,705 Commits 61 Branches 14 Tags
6ac3d8f2e8345ede59970e272139f3307429443c
Commit Graph

150 Commits

Author SHA1 Message Date
hornygranny
dce9dadea2 Merge pull request #5914 from paprka/removewindows 
Changes most border windows/firelocks to full tile
Gets paprika killed
 2014-11-21 11:47:04 -08:00
Remie Richards
85f735c504 Merge pull request #5878 from phil235/DroneShardFix 
Fixes drones cutting their hands when using shards.
 2014-11-17 09:55:19 +00:00
paprka
fd910387c3 windows damage and such 2014-11-16 17:13:33 -08:00
phil235
2340caa309 Fixes drones cutting their hands when using shards. 2014-11-13 17:54:41 +01:00
tkdrg
ed4c03b099 Floor cleanup: Repaths /turf/simulated/floor to /turf/simulated/floor/plasteel 
Repaths carpet and grass to /turf/simulated/floor/fancy/carpet and /turf/simulated/floor/fancy/grass
Cleans up a few floor procs
 2014-11-12 22:50:32 -03:00
paprka
28b1d8bef0 fixes grille rebuilding, removes damaging from tables, adds better sound effects for smashing tables, adds chance to fail breaking reinforced tables as hulk 2014-11-03 20:41:40 -08:00
paprka
f268f3d357 Merge branch 'master' of https://github.com/tgstation/-tg-station into glasstables 2014-11-03 18:31:43 -08:00
paprka
ffd02c45c2 second commit for table redoing 2014-11-02 10:52:25 -08:00
paprka
85de5f7cd5 initial commit for table overhaul 2014-11-01 23:57:01 -07:00
xxalpha
b9f5947f5e High-traction Floor 2014-10-31 01:50:31 +00:00
tkdrg
0bb462e857 Fixes botcall conflicts, removes even more cruft and unused code 2014-10-30 20:36:30 -03:00
tkdrg
9526b8804b Merge remote-tracking branch 'upstream/master' into attackoftheturfs 2014-10-30 19:35:03 -03:00
phil235
b971a09bcd Wrapping something with package wrapper now gives a message. 
Adding a check so clicking an already giftwrapped item doesn't show the wrapping message.
Adding nobludgeon flag to wrapping paper to remove attack messages
Removing w_class line from package wrapper because already in its parent.
Remove the unnecessary message (box is full/packagewrapper doesn't fit in the box) when wrapping box.
Fixes not being able to wrap box with just one single package wrapper left.
Fixing attack_log (fix issue4180) and only adds log when the wrapping succeeds.
Now using wrapping paper actually uses its amount.
when all used, they will drop cardboard tube like intended.
Fixes issue4207
Fixes not being able to re-add wrapping paper and package wrapper to themselves like proper stacks.
New sprite for both paperwrap and cardboard tube. (from Nienhaus)
 2014-10-23 19:30:09 +02:00
hornygranny
e556867a58 Merge pull request #5277 from paprka/newshotguns 
Adds improvised shotguns and fixes paths for wrap paper
 2014-10-21 09:51:35 -07:00
tkdrg
cd5720b6a7 Floor refactor, try #1 2014-10-19 16:48:35 -03:00
paprka
929662ad3a moved files and fixed tablecrafting 2014-10-17 10:30:04 -07:00
paprka
d244fd6bbd initial commit 2014-10-15 13:29:19 -07:00
Menshin
11b8235f66 Href exploit fixing : the bugfree edition 2014-10-14 23:10:38 +02:00
Menshin
fb3200eba8 * prevent href exploit with stacks multiplier 2014-10-12 01:39:40 +02:00
Remie Richards
f5e54f1fa8 Merge pull request #5069 from phil235/WindoorDeconstruction 
Adds windoor deconstruction & bug fixes
 2014-10-08 10:27:45 +01:00
MrPerson
651c3e6db5 Merge to master - sole conflicting file was ninja.dm FUCK NINJAS 2014-10-04 01:45:39 -07:00
phil235
47521d5081 More windoor bug fixes. You can no longer build two windoors on top of each other. You can make a windoor_assembly w/ rglass on the same tile as another one as long as they have different directions. 2014-09-30 23:05:18 +02:00
Swag McYolosteinen
f9e17faca3 Merge pull request #4889 from Jordie0608/orwecouldpathplasmasheetsasfire 
Repaths clown ore to bananium
 2014-09-24 16:58:23 +02:00
Remie Richards
a9d609bc9b Merge pull request #4802 from Menshin/stacks_merging_cleaning 
Crafted stacks merging cleaning
 2014-09-24 12:04:07 +01:00
Jordie0608
40e0a52283 Repaths clown ore to bananium 2014-09-19 21:26:50 +10:00
Cheridan
f5bf1ddaa9 Merge pull request #4809 from RemieRichards/Drones 
Ports Drones from NTstation + New Improvements/Features
 2014-09-17 16:56:40 -05:00
Firecage
caa4d60503 Phase Honk 2014-09-15 12:44:52 +02:00
Firecage
16502db223 Merge branch 'master' of https://github.com/tgstation/-tg-station.git into STATUESGALORRE 2014-09-15 11:17:44 +02:00
Firecage
ad5d15a225 New part 2014-09-15 11:16:39 +02:00
Menshin
abda57bc26 Location nulling moved to Destroy() proc 2014-09-14 11:51:02 +02:00
Remie Richards
473bcd1858 Ports Drones from NTstation + New Improvements/Features 2014-09-13 15:02:57 +01:00
Menshin
9ae4e3650c * prevented empty stacks from being generated on tiles, when merging stacks on floor after crafting them (e.g metal => floor). 
Fixes #4775
* various clean-up of unnecessary checks related to stacks
 2014-09-13 00:38:39 +02:00
Daniel
d29d3a37da Fixed welding shard message spam 2014-09-10 11:55:07 +02:00
Firecage
2bf0773261 First phase of statues part 1 2014-09-06 21:14:27 +02:00
Firecage
aab99e8825 Fixes what Miauw said 2014-09-06 15:19:58 +02:00
Firecage
38beaaf75c Updates 2014-09-02 01:24:54 +02:00
Firecage
834f9a05b9 Mineral flooring 2014-08-31 17:12:17 +02: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
6c7af5eb32 SPANCLASSES!!!!! 2014-08-26 09:52:13 +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
Kelenius
698fde12f4 Two small bugs... 2014-06-13 01:01:10 +04:00
Kelenius
ce98f5a82b Some grammar 2014-06-11 11:04:00 +04: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
Alex
6686b2ec7c Merge pull request #3687 from Jordie0608/removerelativepathsfromtheeverythingplz 
Fixes #3681: suicide messages when crit
 2014-05-14 09:24:29 +01:00
Jordie0608
4078973a5c Unidentinization 2014-05-13 02:18:21 +10:00
Jordie0608
dfd2cc4b60 Changed suicide messages to visible_messages and fixed relative pathing 2014-05-13 01:44:29 +10:00
MrPerson
9d9a657acf Change examine() from an atom verb to a mob verb 
Just in time for the feature freeze, a big change that will introduce bugs! Yay!
Mob verb is called verb/examinate(target), which just calls target.examine(user) and face_atom(target)
For explanation why, see http://www.byond.com/forum/?post=1326139&page=2#comment8198716
Long story short, mob verbs are much faster than object verbs. The goal is to make right-click menus populate faster.

Also changes a bunch of examine() procs to always, ALWAYS call the parent. Except mobs, but you have 1 guess why I'm not touching them. Mostly this affects obj/item/examine().
And also remove a whole shitload of pointless set src in view(2) kind of crap. Also span classes.
 2014-05-01 09:56:39 -07:00
phil235
aa2c65aaf4 removing some of my code 2014-04-25 20:44:32 +02:00