cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-25 00:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,250 Commits 61 Branches 14 Tags
76ee0a3e1afda1c7fe4bbdd5c0dee7d497a062d8
Commit Graph

10065 Commits

Author SHA1 Message Date
phil235
76ee0a3e1a Fixes typo in a slaughter demon message. 
Fixes slaughter demon icon upon being admin healed/revived.
Add the limit var to datum/spellbook_entry to limit the amount of times it can be bought by the wizard. It's currently only used to limit wizard from summoning more than 3 slaughter demons.
 2015-07-17 21:36:58 +02:00
phil235
ed1d1c1919 Merge pull request #10620 from AnturK/mimic_fixes 
Morph Fixes
 2015-07-17 00:27:59 +02:00
AnturK
f1a2385443 Morph Fixes 2015-07-16 21:50:11 +02:00
phil235
0f37ac3c14 Merge pull request #10601 from xxalpha/nightmaregoggles 
Fixed t-ray goggles not updating pipes&cables correctly.
 2015-07-16 19:52:22 +02:00
WJohn
3537d754b3 Merge pull request #10345 from Steelpoint/HoSArm 
[BALANCE] HoS/ERT/DS Armour Buff | Revolver Armour Piercing
 2015-07-16 11:29:22 -04:00
WJohn
a93dde3034 Merge pull request #10384 from Steelpoint/GasMask 
[BALANCE] Reduces Weight Size of Sechailer Gas Mask
 2015-07-16 11:25:13 -04:00
duncathan
8c2519e115 merge conflicts 2015-07-16 04:54:11 -06:00
duncathan
ae417d2a03 Merge branch 'master' of https://github.com/tgstation/-tg-station into atmosrefactor2 
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm
	code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
	code/ATMOSPHERICS/components/trinary_devices/filter.dm
	code/ATMOSPHERICS/components/trinary_devices/mixer.dm
	code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm
	code/ATMOSPHERICS/components/unary_devices/Freezer.dm
	code/ATMOSPHERICS/components/unary_devices/cryo.dm
	code/ATMOSPHERICS/components/unary_devices/unary_base.dm
	code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
	code/modules/events/vent_clog.dm
	code/modules/mob/living/carbon/human/species.dm
	config/admins.txt
 2015-07-16 04:27:25 -06:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
phil235
49f55d312a Merge pull request #10545 from Miauw62/whyareallsecborgsshitlers 
Adds a huge message to sec borgs telling them not to be shitheads.
 2015-07-14 15:14:16 +02:00
phil235
4763427154 Merge pull request #10559 from Ergovisavi/mediborg_annoyances 
Makes the Mediborg Hypospray attack_self() behave like the Cyborg Shaker
 2015-07-14 15:11:00 +02:00
phil235
1265d49b7c Merge pull request #10470 from Jordie0608/spessmensfourthwallistheceiling 
Fixes ooc autotoggle and adds loc to sprayer log
 2015-07-14 14:45:47 +02:00
phil235
4c859a9ef7 Merge pull request #10497 from AnturK/bagoffixes 
Fixes teleport-swap
 2015-07-14 14:30:05 +02:00
Cheridan
3ca900575e Merge pull request #10489 from Shadowlight213/BraindeadAI 
Adds an examine message to braindead Ais
 2015-07-14 00:33:51 -05:00
Cheridan
b284e44df4 Merge pull request #10425 from Jordie0608/ss13willbenarratedbyLemonySnicket 
Local narrate verb
 2015-07-13 23:48:30 -05:00
Cheridan
c56a445037 Merge pull request #10580 from Ikarrus/bombarmor 
Clothing with bomb armor are less likely to be shredded
 2015-07-13 21:37:09 -05:00
xxalpha
a306520ba9 Fixed t-ray goggles not updating pipes&cables correctly. 
Loc <<
 2015-07-14 00:45:41 +01:00
Swag McYolosteinen
c81d361273 Merge pull request #10143 from AnturK/ditto 
Adds Morph - non-ling shapeshifter
 2015-07-13 18:00:21 +02:00
Cheridan
43bb718b21 Merge pull request #10568 from MrStonedOne/holyshitwhatisthisbullshit 
Removes topic limiter. Increases responsiveness in all uis.
 2015-07-13 01:47:47 -05:00
Cheridan
85148a12af Merge pull request #10504 from optimumtact/sanitycheques 
Add sanity checks to syringe injection after the do_mob call
 2015-07-12 22:11:35 -05:00
Ikarrus
c3ae39a7e8 Clothing with bomb armor are less likely to be shredded 
Should have been this way from the start.
 2015-07-12 14:42:07 -06:00
AnturK
4c3848f279 Changelog 2015-07-12 21:58:01 +02:00
duncathan
71ac607a6b Revert "merge conflicts?" 
I fucked this up
 2015-07-12 12:52:32 -06:00
Swag McYolosteinen
81ec442d50 Merge pull request #10512 from duncathan/traygoggles 
Adds t-ray scanner goggles for atmos techs
 2015-07-12 12:41:37 +02:00
Ergovisavi
72da5e749e Inability to quickly select medicine as mediborg is super annoying, changes hypospray attack_self to be like the Borg Shaker, much easier. 2015-07-12 00:57:21 -07:00
MrStonedOne
bdb264acdf Removes topic limiter. 
Topics are no longer limited to once per 2ds per client.

This massively improves responsiveness by no dropping clicks when trying to browse thru menus.

Anything that could cause lag or otherwise be limited should do that in its own topic, not blog down the rest

Please let me know if you can think of anything that should be limited in this PR otherwise, i say we find out by field testing.
 2015-07-11 23:09:04 -07:00
duncathan
27f4bf3ee0 merge conflicts? 2015-07-11 19:56:54 -06:00
Cheridan
a0a20b0b0a Merge pull request #10484 from Ikarrus/augmaintenance 
Makes augmentations more difficult to maintain
 2015-07-11 19:54:58 -05:00
duncathan
e074fb7856 makes air flow; fixes EVERYTHING 2015-07-11 18:45:19 -06:00
WJohn
dee7423b00 Merge pull request #10480 from Chiefwaffles/CELLS_ARE_HARD 
Change w_class of Power Cells from 3.0 to 2
 2015-07-11 20:25:14 -04:00
Cheridan
61d5425c3f Merge pull request #10503 from phil235/RevolverMisfireFix 
Fixes for lighter, heart attack, defib, light fixture and other stuff
 2015-07-11 19:01:04 -05:00
Cheridan
ab7fef8082 Merge pull request #10526 from phil235/ImprovisedShotgunFix 
Fixes improvised shotgun being deleted when tablecrafted.
 2015-07-11 18:57:13 -05:00
Cheridan
7dc3414da3 Merge pull request #10496 from MrStonedOne/WHYISTHISSOOLOUD 
Helmet of Justice nerfs: Lowers the volume by ~40% and raises the cooldown by ~20%
 2015-07-11 18:16:51 -05:00
Cheridan
68c32438bb Merge pull request #10525 from phil235/FixFix1 
Some fixes and stuff....
 2015-07-11 18:06:29 -05:00
Cheridan
e0bbfbacc1 Merge pull request #10494 from phil235/CloggedScrubberFix 
Fixes for clogged vent event and backpack preferences.
 2015-07-11 09:19:25 -05:00
Miauw
03bf88bfba Adds a huge message to sec borgs telling them not to be shitheads. 2015-07-11 13:39:54 +02:00
duncathan
0e004e3939 fixes runtimes 2015-07-11 02:47:31 -06:00
duncathan
e63771c9f4 finally gets airs, nodes and parents working... sorta 
nodes is working fine as far as I can tell
airs seems fine but it's somewhat untestable until I fix parents
parents is initializing, but not updating properly

also adds my ckey to admins.txt
 2015-07-11 02:47:22 -06:00
duncathan
140bbd3972 3rd pass OOP 
now we've got lists for parents, nodes, and air mixtures
(they're all broken)
moves tank.dm, cryo.dm, Freezer.dm to components/unary_devices/
 2015-07-11 02:47:19 -06:00
duncathan
c3b095a8b3 adds scanners to R&D; adds changelog 2015-07-10 23:15:44 -06:00
phil235
68c360e136 Fixes improvised gun being deleted when tablecrafted. 2015-07-10 23:45:38 +02:00
phil235
7307079f8b Fixes stripping an item from someone not checking if the item is still there after the delay. 
Same fix for pocket picking and removing embedded item.
Adding a warning message when trying to put an item on someone in the wrong slot.
Fixes loyalty implant message upon destruction being sent to wrong/dead people.
Fire on mob will now slowly be consumed (no more forever on fire corpse).
Some work on fire related proc.
Can't lit a mob on fire with a lighter that isn't lit.
Removing duplicate code in species.dm.
You can no longer heal your burns by ingesting clf3 and dousing yourself with water repeatedly.
simplified micro/macro explosive implant's timed explosion code.
 2015-07-10 22:29:06 +02:00
Remie Richards
f7faf4d730 Merge pull request #10487 from MrStonedOne/attacklogcleanup 
Attack logging tweaks/cleanup
 2015-07-10 18:42:08 +01:00
duncathan
5bfaff9879 adds tray goggles 2015-07-10 03:35:56 -06:00
Chiefwaffles
71a397b3bd Super Big Change 
Removes ".0" from "2.0"
 2015-07-09 19:07:05 -07:00
Francis Devine
2800bca2d8 Add sanity checks to syringe injection after the do_mob call 2015-07-10 10:26:59 +12:00
phil235
53a7b37a94 Modified detective revolver isn't deleted anymore when it misfires. 
Heart attack: Moved heart attack var (and changed related code accordingly) from carbon to human since non humans have no use for it. I also added some feedback message when you recover from a heart attack.
Added a click cooldown on touching a light fixture.
burning yourself with a lighter now burns only the arm holding the lighter.
Fixes incorrect message when defibbing heart attack patient.
 2015-07-10 00:18:35 +02:00
MrStonedOne
12580ec5da Fixes siren helmet spam 
Volume has been greatly reduced, and the cooldown has been raised sightly to give short bursts of silence between sirens.
 2015-07-09 12:25:56 -07:00
AnturK
2e9c4f3211 Fixes teleport-swap 2015-07-09 21:22:17 +02:00
phil235
e35c901af2 Fixes The clogged vent event making smoke spawn on welded scrubbers. 
Removes the problematic preference option to spawn without backpack (just drop your backpack after you spawn).
 2015-07-09 20:28:28 +02:00