cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-20 22:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,670 Commits 61 Branches 14 Tags
f31cc6e6cffa74754ed327debaefe49f833801e3
Commit Graph

13696 Commits

Author SHA1 Message Date
Cheridan
09252b4f4b Merge pull request #15657 from KorPhaeron/abductor 
Abductor Airlocks
 2016-02-22 00:05:15 -06:00
phil235
54db9ded4d Moved janitorial sign in a new weapons/miscellaneous.dm 
Made holosign_creator/afterattack() a bit better.
Fixed merge conflict fixing error.
Fixes typos in holosign_creator.dm
 2016-02-22 01:44:53 +01:00
phil235
2ec892a1fc Merge branch 'master' of https://github.com/tgstation/-tg-station into Holobarrier 
Conflicts:
	icons/effects/effects.dmi
 2016-02-22 01:34:20 +01:00
AnturK
2f688f2b64 Merge pull request #15635 from KazeEspada/barfights2 
Bar Fights 2
 2016-02-21 19:36:33 +01:00
KazeEspada
ac7aed2cb7 Removes parentheses 
Really? Really?
 2016-02-21 10:56:57 -07:00
AnturK
39d25029d6 Merge pull request #15644 from ChangelingRain/youthoughtitwasdead 
Revenants now have an essence HUD
 2016-02-21 18:48:40 +01:00
tkdrg
4cf728cd5e Merge pull request #15642 from AnturK/random_things 
Minor fixes
 2016-02-21 10:21:13 -03:00
tkdrg
50bbd40ff4 Merge pull request #15641 from kingofkosmos/toiletgrammarfix 
Urinal message span fix
 2016-02-21 09:41:10 -03:00
KorPhaeron
3f439b211c Abductor Airlocks 2016-02-21 00:01:54 -06:00
Joan Lung
27704409a4 Merge pull request #15595 from KorPhaeron/techno_alchemist 
Arrhythmic Knife
 2016-02-20 17:49:35 -05:00
Joan Lung
55d22a5d37 Merge pull request #15629 from PKPenguin321/patch-18 
Fixes morph transforming message
 2016-02-20 17:48:33 -05:00
tkdrg
001b575898 Merge pull request #15151 from CPTANT/laserfire 
Laser beams may now set you on fire
 2016-02-20 19:19:22 -03:00
KazeEspada
9a33d27e05 Wooden chairs added. Inhands in WJohnston's pull. Fixed an issue with spawning to many sheets upon smashing. 2016-02-20 14:25:29 -07:00
Nerd Lord
00b10a2dc1 updates revenant objectives 2016-02-20 16:13:06 -05:00
KorPhaeron
1485297a64 Fixes dme, can't store knife 2016-02-20 14:57:06 -06:00
KorPhaeron
83ec0ed002 Merge remote-tracking branch 'refs/remotes/tgstation/master' into techno_alchemist 
# Conflicts:
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
 2016-02-20 14:49:30 -06:00
Nerd Lord
4b7438e39f Revenants now have toggleable nightvision. 
Revenants now have an essence HUD.
Revenants now retain essence cap from the previous revenant, minus perfect souls.
Restructured revenant code to be less all over the place
Moved Harvesting to revenant_abilities.dm
Defile has slightly more range, but does less damage to windows.
Blight kills shrooms and vines slightly faster.
 2016-02-20 13:01:25 -05:00
tkdrg
f81e52c164 Merge pull request #15605 from phil235/StreamSpray 
Spray bottles now have a "stream" mode toggled by clicking the bottle.
 2016-02-20 11:56:33 -03:00
AnturK
48e9fb731f Adds missing ..() in SSU New 2016-02-20 15:39:15 +01:00
kingofkosmos
63a6021aa7 Changes a toilet attack message span and changes few instances where using "you" is possible. 
Fixes #15637
 2016-02-20 15:53:30 +02:00
KazeEspada
116cf0ba77 forgot to commit a file 2016-02-19 22:44:23 -07:00
KazeEspada
40ca05b70d Enhances barfights by making chairs smash against people. If they are weak enough, the act of smashing will knock them on their ass. 
Also some backend stuff to make chairs more readable.
 2016-02-19 22:15:37 -07:00
Joan Lung
c576c42e06 Merge pull request #15619 from KazeEspada/chairfixes 
Chair Fixes.
 2016-02-19 22:57:52 -05:00
KazeEspada
2de3fac2f4 Chairs can no longer be stacked with dense items(rare) or dense structures. As well as chairs. 2016-02-19 20:47:43 -07:00
tkdrg
78ad41b8ec Merge pull request #15052 from xxalpha/uhhhhh 
Added new event: portal storm.
 2016-02-19 21:08:16 -03:00
duncathan salt
6458b524a0 Merge pull request #15615 from ChangelingRain/nottheblob 
Blobbernauts and blob spores are now immune to blob chemicals
 2016-02-19 15:51:41 -06:00
PKPenguin321
66609bff90 fixes morph transforming message 
by moving it to before the appearance changes
 2016-02-19 12:52:01 -08:00
Nerd Lord
37eee7c302 keep the heal effect within the tile okay 2016-02-19 14:02:53 -05:00
xxalpha
1a4206c77b Merge remote-tracking branch 'upstream/master' into uhhhhh 2016-02-19 18:32:07 +00:00
KazeEspada
4305097ace Properly typecasts user var on place. 2016-02-18 21:56:24 -07:00
KazeEspada
fd3557761c Fixes the wrong proc being used. 2016-02-18 20:32:00 -07:00
KazeEspada
fff4639bca Fixes an issue where you would plant a chair while moving hands. 
Sets the block chance on declaration rather then on instantiation.
 2016-02-18 20:29:37 -07:00
phil235
61666cca3a Forgot to handle damage from thrown weapons. 2016-02-19 03:05:50 +01:00
KorPhaeron
1ec9f757cc Merge pull request #15591 from Lobachevskiy/telebaton-fix 
Fix police and telebatons ignoring shields
 2016-02-18 19:49:54 -06:00
phil235
8b2708ff9a Replaces holo tape and holo tape projector with holo barrier and holo barrier projector (children of the janitor's holosign creator). 2016-02-19 02:34:57 +01:00
Nerd Lord
59d342af3a Blobbernauts and blob spores now have healing effects when being healed by the blob. 
Blob chemicals no longer work on blob mobs, meaning you can't hit yourself as a blobbernaut to throw things with sorium, darkmatter, or cyclonic grid.
 2016-02-18 17:11:59 -05:00
phil235
eaef2e842a Spray bottles now use a "stream" mode toggled by clicking the bottle. 
The stream mode launches a chem puff that does not react with objects or turfs on its trajectory, it only reacts with standing mobs in its way, the puff doesn't go through the mob and is immediately deleted after reacting, or with the things on the last tile it can reach.
This mode is the initial mode for the nukeops chemsprayer (but the mode can still be toggled if you want to spray things on many tiles). Also the chemsprayer always spray 10 units per use now, and its range in spray mode is reduced to 4 tiles (so player aren't confused by the puff doing nothing when they aim very far and the amount transfered to each tile encountered is very low(amount is divided by range))
Fixes the chem puff appearing behind mobs it passes through.
 2016-02-18 20:55:40 +01:00
AnturK
884b6c3415 Chair hitsound 2016-02-18 17:55:39 +01:00
AnturK
56d2a34201 Splits beds and chairs 
Adds deconstruct structure helper
Moves chair sprites from objects.dmi to chairs.dmi
Fixes check shields passing proper flags on unarmed attacks
Makes stools and chairs able to be picked up
 2016-02-18 17:55:38 +01:00
KorPhaeron
633cb4d1a3 Bo staff fix 2016-02-17 23:05:25 -06:00
KorPhaeron
9992a7cc7d Tribal Knife 2016-02-17 22:37:23 -06:00
KorPhaeron
0d8a181ee7 Knife 2016-02-17 22:33:33 -06:00
Cheridan
cfcecba389 Merge pull request #15575 from phil235/ReviveFix1 
Fixes mob revival
 2016-02-17 20:42:10 -06:00
Cheridan
a66e40eb9a Merge pull request #15558 from Incoming5643/pisssh 
Restores the old sound of windowed doors
 2016-02-17 19:50:29 -06:00
Cheridan
bb00bd311f Merge pull request #15513 from KorPhaeron/chaplain3 
Four more holy weapons
 2016-02-17 19:48:06 -06:00
tkdrg
2934e6c8b7 Merge pull request #15165 from xxalpha/urange 
ultra range again
 2016-02-17 21:32:38 -03:00
tkdrg
0b888afc41 Merge pull request #15572 from KorPhaeron/gland 
Adds missing punctuation to alien mindshock
 2016-02-17 21:22:58 -03:00
Lo6a4evskiy
43207c3070 Fix police and telebatons ignoring shields 2016-02-18 02:57:32 +04:00
AnturK
3c8652e346 Merge pull request #15504 from phil235/HatMaskFacialHairFixes 
Fixes mask and head gear issues
 2016-02-17 21:47:17 +01:00
xxalpha
1bee6b5365 Merge remote-tracking branch 'upstream/master' into uhhhhh 2016-02-17 15:04:51 +00:00