cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 09:03:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,881 Commits 61 Branches 14 Tags
cf5df74a2726bf8b97d43cfd47673d65f1800d8a
Commit Graph

6449 Commits

Author SHA1 Message Date
Cheridan
cf5df74a27 Merge pull request #5540 from phil235/botRepairFix1 
adding CoolDown to welding repair on bot/borg/mecha
 2014-11-02 12:12:19 -06:00
Cheridan
51eae4c5a2 Merge pull request #5601 from phil235/ObjVerbCheckFix 
Adding checks for stun, restrained to many object verbs.
 2014-11-02 11:34:48 -06:00
Cheridan
13c155c5ad Merge pull request #5546 from Perakp/saltAndPepper 
Fixes sneaky pepper mill feeding
 2014-11-02 09:50:30 -06:00
Cheridan
852d54df78 Merge pull request #5495 from phil235/ReagentSplashFix 
You can no longer splash more than one turf/obj with a beaker/bucket by clicking quickly.
 2014-11-02 09:33:48 -06:00
Cheridan
fc86499996 Merge pull request #5579 from wiox/P1 
Throwing items in to disposal bins updates the icon
 2014-11-02 09:31:09 -06:00
Cheridan
d35fbd3ec0 Merge pull request #5555 from rosenmann/food_reassigning 
Reassigned snacks and recipies to more specific categories
 2014-11-02 09:22:56 -06:00
Cheridan
47c2e9339b Merge pull request #5567 from MrPerson/my_little_droney 
Hopefully fixes that runtime where drones could wind up in nullspace.
 2014-11-01 22:39:17 -05: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
Remie Richards
0bc683aa29 Merge pull request #5457 from GunHog/AI_Radio 
Adds AI Integrated Radio
 2014-11-01 03:44:44 +00:00
Remie Richards
3d3521654f Merge pull request #5497 from tkdrg/dingdongbannudesu 
Assistant jobbans now ban people from using "Be assistant"
 2014-11-01 03:42:50 +00:00
Remie Richards
85c2b72cfe Merge pull request #5482 from Menshin/maploader_rewrite 
Maploader rewriting
 2014-11-01 03:41:39 +00:00
Cheridan
f948d3038c Merge pull request #5539 from phil235/Icecreamvat 
Icecream vat fix
 2014-10-31 18:44:39 -05:00
Remie Richards
24b6e9c601 Merge pull request #5506 from hornygranny/OOPgularity2 
makes the singularity's pulling OOP and insanely deadly
 2014-10-31 23:13:11 +00:00
William Wallace
5fbb445168 Throwing items in to disposal bins updates the icon 
This fixes #5504
 2014-10-31 20:04:05 +00:00
Menshin
5037e880d8 Fix the lag produces by oversized Pumpkings bounds interacting with space transitions. 
Reduced the number of meteors to 10 waves of 3 over 40 seconds.
 2014-10-31 19:48:55 +01:00
Cheridan
c8b5f99cf4 Merge pull request #5505 from phil235/AtkMsgFix1 
/item/weapon with force 0 can no longer knock humans down
 2014-10-31 10:02:19 -05:00
Cheridan
9bb612bd79 Merge pull request #5521 from xxalpha/horrorshoes 
Bananium powered clown shoes
 2014-10-31 09:52:56 -05:00
Miauw
0cadefd855 Nothing to see here, continue with your planned spooking, citizens. 2014-10-31 21:52:10 +01:00
Hornygranny
9c95842adf Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity2 
Conflicts:
	code/game/turfs/simulated/floor.dm
 2014-10-30 17:26:25 -07:00
hornygranny
73b83ddef6 Merge pull request #5357 from tkdrg/attackoftheturfs 
Floor refactor
 2014-10-30 17:23:20 -07:00
tkdrg
0bb462e857 Fixes botcall conflicts, removes even more cruft and unused code 2014-10-30 20:36:30 -03:00
MrPerson
00cf1a4f50 Hopefully fixes that runtime where drones could wind up in nullspace. 2014-10-30 15:52:24 -07:00
tkdrg
9526b8804b Merge remote-tracking branch 'upstream/master' into attackoftheturfs 2014-10-30 19:35:03 -03:00
Swag McYolosteinen
4e7cb0eb01 Merge pull request #5530 from MrStonedOne/fukkinreallyerro 
[MSO] Minor sql improvements.
 2014-10-30 21:00:42 +01:00
mrosiew
c72de0c1db Reassigned snacks and recipies to more specific categories 
Also renamed some files.
It shouldn't change the gameplay. Yes, I have checked if I didn't delete
any snack or recipe.
 2014-10-30 18:48:50 +01:00
Cheridan
985eb09333 Merge pull request #5508 from tkdrg/harvestallthethings 
You can now only become a harvester when you can see Nar-sie
 2014-10-30 12:13:35 -05:00
tkdrg
e2c4eebe9d You can now only become a harvester when you can see Nar-sie 2014-10-30 13:24:43 -03:00
Perakp
af78fee8fe - fixes visible messages for feeding someone from condiments. 
- lowercase condiment containers
 2014-10-30 12:46:56 +02:00
MrPerson
3452f63f51 Fixes the singulo drifting through the shield gens and such, woops 2014-10-29 19:18:36 -07:00
MrStonedOne
afbeb03d9f Fixes admin only vv related sql injection exploit in feedback reporting. 
Noticed this while looking over my PR, by storing (and trusting) the escaped version, an admin could edit this in vv and do unspeakable things to the database
 2014-10-29 18:19:47 -07:00
MrStonedOne
6f0666138a Ensures spawned proc is never called if the client goes away 2014-10-29 18:02:21 -07:00
phil235
b8167969a9 Icecream vat overhaul. Fixes all the bugs it had. 
BUG LIST:

Beaker can't be used to add reagents to vat, it goes directly inside the vat and the vat doesn't detect what's inside the beaker. Beaker is useless and its reagents (whatever they are) are used when making icecream.

Cannot put just a bit of reagents in the vat, it empties all the item's reagents or nothing.

Click icecream vat with a snack it will take all the reagents, the snack doesn't disappear until you try to eat it. "Vinny Saylor has emptied all of the egg into the icecream vat."

The vat doesn't work w/o power

Cant dispense cones if their total amount is bigger than 11.

take empty bottle stuff, click on vat, it still says that you empty the content in it.

scooping flavored icecream uses vanilla icecream as well..
 2014-10-30 00:18:37 +01:00
xxalpha
5211f7ffbb Tweaked 2014-10-29 20:44:58 +00:00
xxalpha
a85e0d8613 Adds a variation of the clown shoes 
Sprites and tweaks

Add clown-locker with banana shoes to clown shutle

Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm

Adds clown new shoes to map

DME
 2014-10-29 19:22:11 +00:00
phil235
49921a9bb1 adding CoolDown to welding repair on bot/borg/mecha 
Now eye prot needed to repair bot/borg/mecha
fix bug where you're repairing despite weldingtool being off
Fixes the amount of fuel used per repair to 1 for bot/borg/mecha
Adding message when not enough fuel during borg/mecha repair.
Fuel not used when repair attempt on borg/mecha is canceled (no damage or welder off).
For bot/borg/mecha, now using notice span class for all repair messages and visible message instead of << . All cancel messages uses warning span class.
 2014-10-29 16:50:13 +01:00
MrStonedOne
40d884dbfa Feedback reporting now uses 1 insert query with mutiple rows 
Rather then making a new query for each feedback item.
Each query can take between 25ms and 100ms, and this is a static per-query overhead, so removing the 60 or so needless querys will speed things up.
 2014-10-29 04:22:35 -07:00
MrStonedOne
138567b7cf Removes some sql related lag caused by too many clients connecting at once after a restart 
(and other minor fixes to client sql logic)

Clients will now spread out their sql database connection logging and related ckey by ip/cid searching at world start so it doesn't all happen at once.
Fixes a minor bug with related ckey searching where only one would be returned.
Fixes a minor bug where related ckey searching would return the client's own ckey.
 2014-10-29 04:15:46 -07:00
MrStonedOne
8a064ee545 Removes extra sql sanitize procs in favor of sanitizeSQL() 2014-10-29 04:12:07 -07:00
MrPerson
44095b8fa7 Merge pull request #5498 from phil235/PhotocopierFix1 
No more larva ass photocopy...
 2014-10-29 01:25:34 -07:00
GunHog
a216b7024e Merge remote-tracking branch 'remotes/upstream/master' into AI_Radio 
Conflicts:
	code/modules/mob/living/silicon/ai/ai.dm
 2014-10-28 23:53:26 -05:00
Cheridan
1aef19c835 Merge pull request #4974 from GunHog/Botcall_TG_Edition 
Botcall, TG edition!
 2014-10-28 22:17:35 -05:00
Hornygranny
cc21fd1e70 Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity2 
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
 2014-10-28 15:27:46 -07:00
Remie Richards
07ff02b7c4 Merge pull request #5477 from MrPerson/space_movement_jam 
Space movement rewrite to allow everything to drift
 2014-10-28 22:15:05 +00:00
GunHog
19ab2c4a2b Logic fix + Tweaks 
- Corrects the logic for when the AI can speak on its radio.
- Added a missing "-" to the radio instructions.
- Removed an unneeded feedback line for toggling the AI's radio via
intellicard.
 2014-10-28 10:23:56 -05:00
MrPerson
e9f6e5d17d Added a changelog entry 
Also fixed the chair-diagonal drifting bug somehow
 2014-10-28 07:37:31 -07:00
Hornygranny
68ca3ad091 projectiles no longer anchored, spawns off throw 2014-10-27 18:00:35 -07:00
Hornygranny
0eecb1fc29 lol forgot to save 2014-10-27 16:47:49 -07:00
Hornygranny
264c25b892 makes the singularity's pulling OOP with the magic of atom proc 2014-10-27 16:43:35 -07:00
phil235
4cc39e3859 item/weapon with force 0 can no longer knock humans down and no longer get bloody when used on humans. 2014-10-27 23:08:33 +01:00
hornygranny
082e860bbb Merge pull request #5484 from tkdrg/permissionabuse 
Improves Permissions Panel security
 2014-10-27 13:05:41 -07:00