cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 12:35:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,610 Commits 61 Branches 14 Tags
cc9b4e79d1d605b0463df970147eeb477c5c6c19
Commit Graph

3470 Commits

Author SHA1 Message Date
Cheridan
a5e3851b99 Merge pull request #5216 from phil235/bodybagfix1 
closets can no longer contain a near infinite amount of mobs.
 2014-10-21 12:15:30 -05: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
phil235
c2fcd21499 Adding bluespace bodybags. Adding changelog. 2014-10-21 17:27:40 +02:00
phil235
56c853f9d6 Merge branch 'master' of https://github.com/tgstation/-tg-station into bodybagfix1 
Conflicts:
	code/modules/mob/living/simple_animal/friendly/mouse.dm
 2014-10-21 15:58:39 +02:00
hornygranny
1c9c6d5950 Merge pull request #5249 from phil235/DisplacedGirderFix 
Fix for #4602
 2014-10-20 20:18:06 -07:00
hornygranny
51277f03c0 Merge pull request #5203 from Menshin/href_stacks_multiplier_fix 
Prevent href exploit with stacks multipliers
 2014-10-20 19:34:04 -07:00
hornygranny
55ff8ab432 Merge pull request #5206 from paprka/usedcuffs 
Used zipcuffs name change
 2014-10-20 19:28:10 -07:00
hornygranny
9e2dc67e86 Merge pull request #5363 from Cheridan/better_noms 
Anomaly Event Changes
 2014-10-20 19:24:04 -07:00
Cheridan
455b526cc1 Merge pull request #5318 from phil235/MsgFix2 
More messages fixed
 2014-10-19 21:39:06 -05:00
paprka
2a8e772131 Merge branch 'master' of https://github.com/tgstation/-tg-station into newshotguns 
Conflicts:
	code/modules/projectiles/ammunition/magazines.dm
	code/modules/projectiles/guns/projectile/shotgun.dm
	icons/mob/back.dmi
	icons/obj/gun.dmi
 2014-10-19 17:30:47 -07:00
Cheridan
cb05cb64d1 Merge pull request #5306 from Aranclanos/flashruntime 
Flashes runtime fix
 2014-10-19 18:47:18 -05:00
Cheridan
4adb8c0c9a Merge pull request #5316 from xxalpha/fix_flasher 
Fixes cyborgs being able to add their flashes to things
 2014-10-19 17:44:30 -05:00
Cheridan
21b198dc2c Merge pull request #5314 from MrPerson/qdel_radios 
Make radios garbage collect
 2014-10-19 17:42:06 -05:00
Cheridan
f52d3e8c69 Anomaly Event Changes 
Increases the duration and occurrence rate of Anomaly events.
Anomaly cores now give better research values.
Bluespace anomalies no longer teleport anchored objects because it looks godawful.

If not defused, Pyroclastic Anomalies will create a red or orange slime.
 2014-10-19 17:07:07 -05:00
xxalpha
091cbcca2c deleted bad lines 2014-10-19 04:57:14 +01:00
xxalpha
d9dafa9649 Fix cyborg flashes being useable in flashers and cyborg heads. 2014-10-19 04:35:10 +01:00
phil235
9b9481d65c Changes many span classes. 
Replaces for(mob in oviewers) show_message()  with visible_message() when possible.

Fixes the absolute pathing in Ninja code.

Fixes facehugger attack messages being bold red for third party (only the first leap message will stay bold red for third party, for better visibility)

Standardizes vomiting message

Fixes mech occupant not receiving any attack messages when the mech is attacked.
 2014-10-18 16:00:38 +02:00
Swag McYolosteinen
fdde99e3ca Merge pull request #5239 from tkdrg/sanictoobs 
Makes transit tubes a lot faster
 2014-10-18 09:54:48 +02:00
MrPerson
ec9f595b1f Make radios garbage collect 2014-10-18 00:05:03 -07:00
Aranclanos
134c4d6209 Fixes a runtime with flashes when they burn out without user, now they'll display the burn out message from the src instead. 2014-10-17 16:42:51 -03:00
Cheridan
05f63d6181 Merge pull request #5238 from paprka/removegreyshirt 
Adds random jumpsuit colors for assistants
 2014-10-17 14:34:58 -05:00
paprka
929662ad3a moved files and fixed tablecrafting 2014-10-17 10:30:04 -07:00
hornygranny
c936f3134d Merge pull request #5268 from paprka/zipeties 
fixes zipeties typo
 2014-10-17 07:35:07 -07:00
paprka
8312c52286 Merge branch 'master' of https://github.com/tgstation/-tg-station into removegreyshirt 
Conflicts:
	icons/mob/uniform.dmi
 2014-10-16 21:29:10 -07:00
Remie Richards
e124c29f8d Merge pull request #5201 from Cheridan/permits 
Adds Construction Permits
 2014-10-17 05:24:37 +01:00
paprka
85478315e6 Merge branch 'master' of https://github.com/tgstation/-tg-station into zipeties 2014-10-16 09:28:11 -07:00
paprka
c29cc89864 Merge branch 'master' of https://github.com/tgstation/-tg-station into newshotguns 
Conflicts:
	icons/obj/gun.dmi
 2014-10-16 09:26:26 -07:00
Cheridan
a5638c7107 Merge pull request #5152 from paprka/medicalbeltsstuff 
Hyposprays fit in medibelts now
 2014-10-16 08:46:54 -05:00
Cheridan
13b59d2d0e Merge pull request #5165 from paprka/INGLEWOODINGLEINGLEWOOD 
Expands medipens & mining
 2014-10-16 08:44:36 -05:00
Cheridan
01e7b0af6d Merge pull request #5218 from Perakp/dnaInjectorGarbage 
Garbage collect dna injectors
 2014-10-16 08:34:50 -05:00
Cheridan
17c9aaa6dd Merge pull request #5263 from Aranclanos/electropackrevamp 
Electropack fixes
 2014-10-16 08:08:57 -05:00
hornygranny
53cb161add Merge pull request #5245 from paprka/removespammessages 
Removes a few spammable visible messages
 2014-10-15 16:41:09 -07:00
paprka
54b575523a removes zippo changes 2014-10-15 16:32:51 -07:00
paprka
4c7831c4fd Merge branch 'master' of https://github.com/tgstation/-tg-station into zipeties 
Conflicts:
	code/game/machinery/bots/secbot.dm
 2014-10-15 13:32:24 -07:00
paprka
d244fd6bbd initial commit 2014-10-15 13:29:19 -07:00
phil235
45cfe07f98 Merge branch 'master' of https://github.com/tgstation/-tg-station into DisplacedGirderFix 
Conflicts:
	code/modules/recycling/disposal.dm
 2014-10-15 18:23:40 +02:00
phil235
dbea503e88 Removing the fourth argument (air_group) of CanPass() everywhere, because it isn't used anywhere. 
Fixing one instance of "for(mob in viewers) show_message()" to "visible_message()"
 2014-10-15 18:03:06 +02:00
tkdrg
1ed1c6f40b Changed breakout times to use the new constants 2014-10-15 11:40:25 -03:00
tkdrg
e9f418d568 Merge branch 'master' into sanictoobs 2014-10-15 11:39:27 -03:00
Aranclanos
9077c173d1 Merge pull request #4759 from Donkie/pipes2 
Major Pipe Upgrade Hashtag 2
 2014-10-15 11:36:25 -03:00
Aranclanos
d2d92dd35f Merge pull request #4873 from optimumtact/clicktyclackety 
Adds click cooldown to clicking on mobs Fixes #4812 Take2
 2014-10-15 11:03:02 -03:00
Aranclanos
5561e8d9dc Merge pull request #5250 from phil235/SprayPasstableFix 
Fix for #5224
 2014-10-15 10:48:14 -03:00
Aranclanos
bd2f0692d3 Merge pull request #5222 from phil235/c4GibFix 
You can no longer gib mob with c4+signaler
 2014-10-15 10:43:20 -03:00
Aranclanos
a31b372ea7 Merge pull request #5171 from phil235/ed209fix 
A lot of secbot/ed-209 fixes.
 2014-10-15 10:42:30 -03:00
Remie Richards
7bb012127c Merge pull request #5235 from phil235/CollapsibleRollerBed 
Collapsible Rollerbed
 2014-10-15 11:54:48 +01:00
paprka
dc9d194706 fixes zipeties typo 2014-10-15 00:07:42 -07:00
Aranclanos
a1d49cfeb4 Changes the path of electropacks from objitemdeviceradioelectropack to objitemdeviceelectropack. 
Fixes some runtimes related to electropacks.
Securing electropacks will no longer be required to use a helmet on it, same with dissembling the shockkit with a wrench or placing it in a chair.
Removes the atom var 'moved_recently' that was only used by electropacks (really). Now the electropack will have an inner cooldown instead.
The cooldown of the shock will be 10 seconds, giving the shocked person some small time to move in-between shocks (the shock gives you 5 of weakened).
 2014-10-14 21:44:56 -03:00
Menshin
11b8235f66 Href exploit fixing : the bugfree edition 2014-10-14 23:10:38 +02:00
tkdrg
c6ba2b5c22 Shortens stopped tube time and cleans up a bit 2014-10-14 14:14:58 -03:00
phil235
72cc3274df Adding passtable and passgrille to obj/effect/effect and its children so effects aren't blocked by tables and grilles. 2014-10-14 18:34:19 +02:00