cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 00:51:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,785 Commits 61 Branches 14 Tags
6f8659ce044654536df2a67f1868765fe285bee3
Commit Graph

19922 Commits

Author SHA1 Message Date
Razharas
6f8659ce04 Merge pull request #12231 from duncathan/maps 
Adds the name of the current map to world.log at roundstart
 2015-10-10 03:25:28 +03:00
Razharas
8fd2f74d2b Merge pull request #12223 from phil235/BugFixBoogalooB 
Bug fix boogaloo, etc...
 2015-10-10 03:24:38 +03: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
Razharas
8d3b1ac018 Merge pull request #12202 from Xhuis/autorifle_removal 
Armory re-mapping and autorifle removal
 2015-10-10 03:21:52 +03:00
Razharas
34f1552eb5 Merge pull request #12199 from Aranclanos/hypomedborg 
Fixes medborgs injecting mobs without reagents with their hypospray
 2015-10-10 03:17:11 +03:00
Razharas
acbe87be22 Merge pull request #12186 from MrStonedOne/patch-46 
Adds logging and admin announce to admin ghosting.
 2015-10-10 03:16:05 +03:00
Razharas
9422258e84 Merge pull request #12181 from Xhuis/second_best_to_the_perma_fire_gimmick 
Spell book rebalance
 2015-10-10 03:15:53 +03:00
Razharas
28c9a70ace Fixes spell list clearing 
Fixes spell list clearing
 2015-10-10 02:55:51 +03:00
Razharas
32fd0da9f2 Merge branch 'patch-1' of https://github.com/whitefox08/-tg-station into whitefox08-patch-1 2015-10-10 02:38:43 +03:00
Razharas
9dec40d8d5 Removed colon 
Removed colon
 2015-10-10 02:31:19 +03:00
Razharas
880a9f0544 Merge branch 'cargonevergetsanything' of https://github.com/bgobandit/-tg-station into bgobandit-cargonevergetsanything 2015-10-10 02:28:24 +03:00
Razharas
b2cb2923da Fixed bgos description 
Fixed bgos description
 2015-10-10 02:06:57 +03:00
Razharas
effae76516 Merge branch 'bundlestuff' of https://github.com/bgobandit/-tg-station into bgobandit-bundlestuff 2015-10-10 02:04:43 +03:00
phil235
4a71185268 * Fixes butchering, it no longer does both an attack and butchering at the same time. 
* Morph no longer automatically drop its content on death, you have to butcher it to retrieve the content, 10 items at a time.
* And those items are spread in a one tile radius to avoid having too many things on one tile).
*The morph also drops generic meat during final butchering (it's only because it needed to drop something to be able to be butchered, feel free to change the meat to something else)
 2015-10-10 00:03:55 +02:00
Firecage
d907ad6ef3 Reverts the revert of the revert 2015-10-09 17:44:12 +02:00
Aranclanos
0fccd6ffce Revert "Revert "Removes alien driveby"" 2015-10-09 12:35:43 -03:00
Swag McYolosteinen
43f90e8b3a Merge pull request #12236 from tgstation/revert-12163-aliendryby 
Revert "Removes alien driveby"
 2015-10-09 17:22:03 +02:00
Jordie
56c6c3f613 Merge pull request #12210 from GunHog/How_To_Train_Your_Xeno 
Praetorian Promotion Fix
 2015-10-10 00:10:32 +11:00
Razharas
5baaf06fce Merge pull request #12225 from phil235/BugFixBoogalooC 
Trashbag can pick up ammo casings and reagent_containers/food/drinks again.
 2015-10-09 12:42:17 +03:00
Razharas
87f2cbf4ed Merge pull request #12218 from phil235/BugFixBoogalooA 
Fixes critical bug causing multiple hits from single projectile.
 2015-10-09 12:41:08 +03:00
Cheridan
136140614d Merge pull request #12151 from AnturK/larvafix 
Misc Fixes
 2015-10-08 07:20:30 -05:00
Xhuis
406f727ead Armory remap, autorifle removal 2015-10-08 08:03:58 -04:00
AnturK
75e82f15f2 Return for buckling procs 
Makes unbuckling priority over removing bag in janicart
Makes doors bumped in janicart open.
 2015-10-08 13:40:53 +02:00
duncathan
996ef3503b adds current map to roundstart world.log 2015-10-07 22:01:43 -06:00
phil235
832e650ffc Trashbag can pick up ammo casings and reagent_containers/food/drinks again. 
Dipping a lit cigarette into a reagent container heats up the liquid (like every other heat sources) and only unlit cigarette can be dipped to absorb the liquids now.
 2015-10-08 01:26:55 +02:00
phil235
0efb30434a Fixes not being able to move during jaunting if you are cuffed and pulled. 
Greenglow decal no longer disappears after 2 minutes.
Fixes runtime with explosive implant activation.
Fixes stunbaton infinite cell charge, the baton now turns off if you try using it after its cell has been deleted somehow.
Fixes bloody pulled mob leaving a blood trail in zero G.
Shortens the guardian battlecry message when attacking to lower chat spam.
Items in Morph now disperses a bit on death instead of being all on the same tile.
After reaching a limit of 50 items, morph swallowing items deletes them instead of putting them inside the morph.
Monkeys can no longer modify the hand labeller's text to communicate.
Fixes carbon,radium,uranium 's reaction_turf creating multiple decal on a tile, it now checks if there's already a decal of the relevant type and (for radium and uranium) only transfers reagent to it if it finds one.
 2015-10-08 00:48:00 +02:00
Razharas
7aae089d5a Merge pull request #12094 from AnturK/mapcase 
Adds support for custom showcases on the map
 2015-10-07 22:26:43 +03:00
Razharas
92523c03f2 Merge pull request #12137 from Xhuis/sleeping_carp_buff_2_please_dont_ban_me_from_the_repo 
Sleeping Carp changes
 2015-10-07 22:25:11 +03:00
Razharas
8b4447dcad Merge pull request #12157 from Xhuis/can_we_do_this_again 
Generalizes vomit into a single carbon proc
 2015-10-07 22:20:32 +03:00
Razharas
e3065b1643 Merge pull request #12164 from Aranclanos/crewmonitor 
Changes map generation time at roundstart
 2015-10-07 22:17:11 +03:00
Razharas
8ab1c5501a Merge pull request #12182 from KorPhaeron/cult 
Removes cult scaling
 2015-10-07 22:16:44 +03:00
Razharas
b8adf736a5 Merge pull request #12185 from MrStonedOne/patch-45 
Removes admin announce and admin log from follow.
 2015-10-07 22:15:10 +03:00
phil235
dbaba791f3 Fixes critical bug causing multiple hits from single projectile. 
Fixes some other potential issues coming from changing a few del() to qdel().
Fixes not being able to shoot mob on same tile as the shooter.
Fixes being able to shoot oneself by simply clicking our mob.
Fixes not being able to shoot non human mobs right next to us.
 2015-10-07 20:57:36 +02:00
Razharas
78f5e90467 Merge pull request #12191 from Shadowlight213/Revenantlobby 
Fixes Revenant speech being heard in the lobby
 2015-10-07 19:33:17 +03:00
GunHog
305f5bd21d Promotion Fix 
- Was trying to use up the target's plasma instead of the user's.
- Raises the cost back to 500, as was intended by WJ.
 2015-10-07 08:19:54 -05:00
Swag McYolosteinen
38f5c0c85a Merge pull request #12122 from Steelpoint/Magazine 
[MAP] Continuation Of Armoury Map PR + Magazine Removal
 2015-10-07 15:13:15 +02:00
Swag McYolosteinen
4697cdb1df Merge pull request #12083 from KorPhaeron/candycornvampire 
Fixes the detectives hat
 2015-10-07 13:36:35 +02:00
xxalpha
7c98cb54e3 Fixed asteroid rock edging breaking wall smoothing. 2015-10-07 12:01:01 +01:00
Razharas
0ad7257a52 Merge pull request #12089 from MrStonedOne/maprotation 
HOLY FUCKING SHIT, I'VE DONE IT! Map rotation!
 2015-10-07 07:53:42 +03:00
MrStonedOne
701e966f8f choosen -> chosen 2015-10-06 21:50:19 -07:00
MrStonedOne
8d30d50c63 Adds a next map status tab entry. 2015-10-06 21:21:10 -07:00
MrStonedOne
1f7234d3bb adds prompt and logging to trigger map rotation verb 2015-10-06 21:20:35 -07:00
MrStonedOne
e27e9e8371 Map rotation fixes: 
Fixes mutiple rotate operations from breaking the server, map rotation will properly detect rotation operations as well as update operations and abort.
Fixes max pop being treated as minpop
Adds more feedback to admin verbs.
 2015-10-06 21:12:00 -07:00
Razharas
588bd2d570 Merge pull request #12184 from duncathan/dellogging 
Adds del() log to world.log and updates the runtime condenser to condense del() logs
 2015-10-07 04:59:05 +03:00
Razharas
2787925676 Merge pull request #12165 from Chnkr/patch-2 
BYOND: Calling things each tick.
 2015-10-07 04:00:42 +03:00
Xhuis
815c7aa435 ACTUALLY removes cauterize 2015-10-06 20:18:53 -04:00
Xhuis
527c7b568d Removes Cauterize 2015-10-06 20:17:43 -04:00
Xhuis
dbab97bb34 Merge remote-tracking branch 'remotes/upstream/master' into wiz_spell 2015-10-06 20:12:42 -04:00
Xhuis
71861ccd1a Conflicts 1/3 2015-10-06 20:12:21 -04:00
Razharas
156e0cabda Finishes Kors PR 
Finishes Kors PR
 2015-10-06 23:14:06 +03:00