cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-14 10:53:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,110 Commits 62 Branches 14 Tags
dee7423b0041e14cc847f4e4b2ff296efab94884
Commit Graph

10012 Commits

Author SHA1 Message Date
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
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
Chiefwaffles
71a397b3bd Super Big Change 
Removes ".0" from "2.0"
 2015-07-09 19:07:05 -07: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
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
Jordie
8bf129cc06 Merge pull request #10336 from AlexanderUlanH/riotshotguns 
Rubber Shotgun Pellets
 2015-07-09 20:56:25 +10:00
Jordie
4928617c2b Merge pull request #10334 from xxalpha/jetbutt 
Added ability for items inside items to have action buttons.
 2015-07-09 20:51:29 +10:00
Jordie
f72cee2ad0 Merge pull request #10467 from MrStonedOne/patch-22 
Makes log viewing use ftp() over run()
 2015-07-09 20:46:17 +10:00
Jordie
d1f212a13e Merge pull request #10454 from MrStonedOne/patch-20 
Prevents sentience potion from working on monkies
 2015-07-09 20:45:42 +10:00
Jordie
ed9fcf1ccf Merge pull request #10446 from GunHog/Radio_Fix 
Fix for request console emergency broadcast runtime
 2015-07-09 20:45:09 +10:00
Jordie
db8655d878 Merge pull request #10439 from Incoming5643/takethatracism 
Fixes Mutantrace Color Selection
 2015-07-09 20:44:56 +10:00
Jordie
989c8d2a8a Merge pull request #10436 from Ikarrus/fixrandomnames 
Fixes Race Swap Runtime
 2015-07-09 20:44:41 +10:00
MrStonedOne
a262f9aac7 Attack logging tweaks 
Removed the "feature" to have something log in an atom's vv attack log, but not the file attack log. all attack log items will go to the file as well as vv.

Replaced all hard coded src.name/name for attack log's object argument with an actual object (src) except where it made more sense not to.

All attack logging *should* happen AFTER damage is applied now.

Removed the confusing attack entry for when a changeling stings another changeling.

Tweaked how punch attack logs worked
 2015-07-08 23:14:37 -07:00
Chiefwaffles
1639e46067 Update cell.dm 2015-07-08 20:08:46 -07:00
xxalpha
e0f2b93089 Merge remote-tracking branch 'upstream/master' into smoothballs 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2015-07-09 02:40:21 +01:00
Cheridan
2c3c8d7ae3 Merge pull request #10455 from Ikarrus/cyborgobjectives 
Borging Antagonists
 2015-07-08 17:40:01 -05:00
Chiefwaffles
70ff300812 Changed w_class of the base power cell from 3.0 to 2.0 2015-07-08 15:18:05 -07:00
Swag McYolosteinen
ca88306125 Merge pull request #10440 from MrStonedOne/patch-19 
Utterly guts the player privacy poll.
 2015-07-08 17:34:25 +02:00
MrStonedOne
de7b8c3c30 Removes privacy poll, part7: newplayer.dm 
I forgot about this part.
 2015-07-08 08:24:06 -07:00
Swag McYolosteinen
7e1abe68cb Merge pull request #10373 from kingofkosmos/beakerdrink 
Drink spilling and beaker feeding
 2015-07-08 13:06:15 +02:00
MrStonedOne
7605f5bf27 Makes log viewing use ftp() over run() 
This will give the admin a save file dialog.

This is because byond seems hell bent on getting rid of run()
 2015-07-07 21:14:55 -07:00
Ikarrus
4c4d1aaae4 Rewording 2015-07-07 20:37:07 -06:00
xxalpha
e7a90863b7 Repath grass. 2015-07-08 02:06:14 +01:00
xxalpha
ab1227625f Merge remote-tracking branch 'upstream/master' into smoothballs 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2015-07-08 00:43:02 +01:00
Incoming
f136bf19a5 today I learned something new about in and how it interacts with logical operators 2015-07-07 18:56:35 -04:00
xxalpha
5a5372ed96 Repathed carpet, and other shit I forgot. 2015-07-07 23:01:13 +01:00
Ikarrus
3497744234 Makes it really obvious that antags no longer have objectives after being borged 
Because people were confused by their memory being shown to them after the operation, which includes their objectives.
This also puts brains on a layer just above human mobs, so they can be seen when they pop out.
 2015-07-07 15:11:53 -06:00
MrStonedOne
0828401db9 Prevents sentience potion from working on monkies 
Logic: they can be converted to humans, this be too OP
 2015-07-07 13:53:36 -07:00
phil235
1a0f0469e9 Merge pull request #10376 from Perakp/simpleAnimalEmoteSpam 
Fixes hostile animal emote spam
 2015-07-07 20:22:31 +02:00
GunHog
7d744fa7de Fix for request console emergency runtime 
- Fixes 10441
- Ensures that any span changes set forth by NTSL scripts are valid
lists with allowed values, preventing runtimes.
 2015-07-07 11:02:44 -05:00
Cheridan
c72c44bc18 Merge pull request #10426 from Ikarrus/shredreduction 
Removes light blasts shredding clothes
 2015-07-07 09:53:40 -05:00
MrStonedOne
b56648205f Removes privacy poll, part2: newplayer/login.dm 2015-07-07 07:01:27 -07:00
MrStonedOne
a4d3c887be Removes privacy poll, part1: poll.dm 2015-07-07 06:58:46 -07:00
Cheridan
65484c6457 Merge pull request #10419 from Ikarrus/gangbadmin 
Fixed Badmins being able to exceed the gang limit with excessive buttons
 2015-07-07 08:57:30 -05:00
Cheridan
c286b1710d Merge pull request #10360 from Perakp/cargoVirusEvent 
New shuttle loan event + fixes
 2015-07-07 07:42:08 -05:00
Cheridan
54754c52a9 Merge pull request #10407 from nullstation/hi-extended-patch 
Improvements to crew monitoring computer
 2015-07-07 07:12:08 -05:00
Incoming
36e9d976c5 removes some yet unneeded code to make mutant race color selection work again 2015-07-07 02:26:28 -04:00
Ikarrus
9d92933bea Staff of change now assigns lizard name when appropriate 2015-07-06 22:04:05 -06:00
Ikarrus
a949c80fee Fixes Race Swap Runtime 
- Fixes Race Swap Runtime
- Staff of change now assigns lizard name when appropriate
 2015-07-06 21:47:30 -06:00
Remie Richards
1fe4aee65e Merge pull request #10415 from Ikarrus/lizardnames 
Random Names for Lizards
 2015-07-07 03:24:55 +01:00
Ikarrus
b1d8d049c1 Renames duplicate random_name() proc 2015-07-06 20:15:47 -06:00
Ikarrus
75578aa69d Removed Shredding for light blasts 2015-07-06 16:45:21 -06:00