cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-22 06:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,292 Commits 61 Branches 14 Tags
961eeea661aa24bcb6bdedc04414fa856446f0df
Commit Graph

669 Commits

Author SHA1 Message Date
duncathan
9066bc7c4f Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos 
Conflicts:
	code/controllers/subsystem/air.dm
	code/datums/gas_mixture.dm
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	tgui/assets/tgui.css
	tgui/assets/tgui.js
	tgui/scripts/interfaces/atmos_filter.ract
 2016-01-13 20:07:21 -06:00
KorPhaeron
cf537737a1 Closets 2016-01-06 12:39:07 -06:00
SouDescolado
3b257854f0 Merge pull request #1 from tgstation/master 
Merge shit
 2016-01-05 14:44:37 -02:00
SouDescolado
92b3c84a22 Make the code beautiful 
Less lines, same code.

Trying to fix merge conflict.

Gah
 2016-01-05 14:36:39 -02:00
Lularian
cb50a25772 gives barman his cool stuff again 2016-01-03 19:35:49 -06:00
bawhoppen
3543175c51 Revert "fixes attempt two" 2016-01-03 19:05:52 -06:00
Lularian
f5bc4b6b4f woops 2016-01-03 17:50:20 -06:00
bawhoppen
3f5101d84d oops? 2015-12-31 16:39:28 -06:00
Lularian
8e8526fd14 did I do it mum 2015-12-31 16:37:22 -06:00
duncathan
cc9c5768ca Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos 
Conflicts:
	code/datums/gas_mixture.dm
 2015-12-28 13:59:16 -06:00
tkdrg
e88bf4e2b5 Merge pull request #14084 from MrStonedOne/GOOOOOF 
Upgrades do_after and progress bars.
 2015-12-28 14:35:34 -03:00
duncathan
b18cb5fca8 making shit compile 2015-12-28 08:31:20 -06:00
tkdrg
f6db2f4ac9 Merge pull request #14067 from AnturK/mulecratefix 
Fixes mulebot crates
 2015-12-27 14:21:47 -03:00
MrStonedOne
5f68bedcd1 Upgrades do_after and progress bars 2015-12-26 21:04:19 -08:00
AnturK
af70509257 Fixes mulebot crates 2015-12-26 17:24:16 +01:00
KorPhaeron
64bc7ee1e1 Detective starts with his bowman on 2015-12-25 02:14:19 -06:00
Akke
5821dd81ad we dont have a shotgun tree you know 2015-12-21 13:37:31 +00:00
KorPhaeron
d8a37204e7 Makes burn_state use defines 2015-12-13 05:36:55 -06:00
Vincent
16303c1c1f Changes flag name from ABSTRACT to NODECONSTRUCT 
Removes holo-tables and holo-windows since those typepaths are no longer needed.
Updates Z2 to reflect this.  Removes spurious tag tags in Z2.
 2015-11-30 20:26:03 -05:00
Vincent
05ae680b06 Fixing conflicts: 
code/game/machinery/computer/computer.dm
	code/game/machinery/doors/windowdoor.dm
	code/game/objects/structures/window.dm
 2015-11-29 19:02:30 -05:00
Jordie
da0c466f82 Merge pull request #13149 from Firecage/toolspeed 
Adds toolspeed
 2015-11-29 21:06:15 +11:00
Dorsisdwarf
592553354f Merge pull request #12899 from TechnoAlchemisto/master 
Makes cloaks into Exosuits as god(I) intended.v2
 2015-11-27 22:22:47 +00:00
duncathan salt
383e77db8a Merge pull request #13220 from KorPhaeron/godwillsit 
Adds knight armour
 2015-11-27 13:58:08 -06:00
Vincent
026e6ee772 Sets up the the ABSTRACT flag to be used by machines and structures that should not be disassembled or break into parts. 
This is specifically used by the holodeck for things that should be immune to disassembly.

Fixes invisible windoors in the holodeck.
Standardizes the fire axe's interaction with windows.
Fixes a runtime with holodeck tiles getting broken or burned.
 2015-11-26 21:11:54 -05:00
AnturK
e36853d7c9 Convert bots to simple animals - Updated 7.0 2015-11-26 22:06:07 +01:00
KorPhaeron
c8f3ca728f Adds Knight Armour 2015-11-25 15:46:54 -06:00
Firecage
c933363062 Adds the toolspeed var and adds it to most usages of tools which has a timer 2015-11-21 19:24:14 +02:00
Cheridan
5f2ed41bc6 Merge pull request #12873 from KorPhaeron/zipties 
Captain and HoP lockers now contain zipties
 2015-11-10 08:03:53 -06:00
TechnoAlchemist
7b7a3cfd53 puts the new exosuit head of staff cloaks in their lockers. This time for real. 2015-11-07 01:28:44 -08:00
KorPhaeron
f332f595a2 zip ties 2015-11-05 18:03:12 -06:00
Nerd Lord
0f23809346 Revenant changes XVIII 
Made the abilities easier to tweak and somewhat less copypasta. They're still for() loops though.
Check the changelog for additional details.
 2015-11-05 18:50:51 -05:00
Razharas
3cd68567ab Merge pull request #12754 from KorPhaeron/headsets 
Adds normal captains headset to captains locker
 2015-11-02 01:35:25 +03:00
Razharas
aa3198afd1 Merge pull request #12749 from GunHog/This-is-why-you-remember-to-SYNC! 
Missing Diagnostic HUDs commit
 2015-10-31 21:37:29 +03:00
Razharas
615275f71f Merge pull request #12496 from kingofkosmos/interactivescreenalerts 
More interactive screen alerts and workarounds for the resist-button
 2015-10-31 15:13:15 +03:00
KorPhaeron
354a03ea37 Headset 2015-10-30 05:30:42 -05:00
GunHog
336b57bd5a Missing Diagnostic HUDs commit 
For some reason, the final commit for DiagHUDs was lost. This adds
Diagnostic HUDs to roboticist lockers, the protolathe properly, fixes
the night HUD's onmob sprite and adds a quick changelog.
 2015-10-30 00:45:31 -05:00
Cheridan
89f8b0eea5 Merge pull request #12697 from KorPhaeron/biobag 
Moves biobags under biosuits
 2015-10-28 16:37:19 -05:00
kingofkosmos
2c0f178e31 Embedded object -alert can be clicked to remove the object. 
When handcuffed, a handcuffed-alert appears and clicking it is the same as clicking on resist. Same with legcuffing.
Moving in a Suit Storage Unit or welded/locked locker or morgue tray is now the equivalent of pressing resist.
 2015-10-28 21:10:50 +02:00
Razharas
a59d4c47f0 Merge pull request #12234 from Incoming5643/flapping_intensifies 
Modifies plastic flaps to defeat the secret box technique.
 2015-10-28 19:39:45 +03:00
Razharas
980b3ec4a3 Merge pull request #12071 from KorPhaeron/captainqol 
Small tweaks to captains starting equipment
 2015-10-28 19:36:09 +03:00
KorPhaeron
fe6adf6cc1 Biobag 2015-10-27 16:13:43 -05:00
Incoming
ddbfec6fbc Merge branch 'master' of https://github.com/tgstation/-tg-station into flapping_intensifies 
Conflicts:
	code/game/machinery/computer/shuttle.dm
 2015-10-24 23:32:55 -04:00
Cheridan
6bfa738a24 Merge pull request #12567 from phil235/EffectSystemTweak 
Makes effect system code more OOP.
 2015-10-22 21:00:10 -05:00
Cheridan
ecdaeaad4c Merge pull request #12540 from Incoming5643/this_blows 
Syndicate bomb payloads will now detonate if set on fire
 2015-10-21 19:11:05 -05:00
phil235
fb7ad8b38f Merge pull request #12452 from Xhuis/radical 
Radiation tweaks and a geiger counter
 2015-10-22 01:13:00 +02:00
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
Incoming
1db3c0c18b Syndicate bomb payloads will now detonate if set on fire long enough. Note that the casings for the bombs is fireproof, so if you want to set fire to a bombcore you'll need to remove it from the case first. 
Fixes #12468 while I'm here to avoid another box pull
 2015-10-20 15:52:38 -04:00
bgobandit
b554319d6a biobag hotfix 2015-10-19 18:02:57 -04:00
Razharas
6fc19c7c23 Merge pull request #12385 from bgobandit/morexenobioshit 
Adds bio-bags, primarily for xenobiologists.
 2015-10-19 19:53:45 +03:00
Steelpoint
3662a52eb1 Merge branch 'master' of https://github.com/tgstation/-tg-station into Armoury 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2015-10-19 02:16:24 +08:00