cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 04:27:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,396 Commits 61 Branches 14 Tags
fae181be7c518dfd0b0396cce2d4afcff3cbbca7
Commit Graph

3411 Commits

Author SHA1 Message Date
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
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
phil235
cf40b75313 fixing typo 2014-10-13 18:52:13 +02:00
phil235
619a38ad89 Adds the ability to collapse rollerbed (from baystation). Fixes being able to pick up pill bottles and fold bodybags through windows via click drag. 2014-10-13 17:17:53 +02:00
Remie Richards
4640999701 Merge pull request #5199 from paprka/telebatonlog 
stun logging for telebaton
 2014-10-13 11:48:17 +01:00
Remie Richards
07b621421c Merge pull request #5196 from phil235/grammarFix1 
Small grammar fix.
 2014-10-13 11:41:45 +01:00
Remie Richards
399977d882 Merge pull request #5095 from MrPerson/table_module 
Move table crafting into the modules folder plus improvements
 2014-10-13 10:42:16 +01:00
Swag McYolosteinen
552755ffbc Merge pull request #5223 from paprka/zippertiesfixy 
Fixes ziptie bug
 2014-10-13 08:06:00 +02:00
paprka
739cc29dbd removes typecasting from zipcuffs cutting 2014-10-12 14:02:04 -07:00
paprka
8986181e44 fixes ziptie bug 2014-10-12 13:39:55 -07:00
phil235
f5eb963720 You can no longer gib mobs by placing a c4 with a signaler on its wire in the hands/pocket/backpack of the mob and sending the signal. 2014-10-12 22:17:37 +02:00
Remie Richards
20c6f4cbac Merge pull request #5173 from paprka/knocky 
Unique sound for knocking on glass with bare hand/TK
 2014-10-12 20:50:57 +01:00
Swag McYolosteinen
816cc598ce Merge pull request #5155 from tkdrg/tubemagic 
Transit tube construction bugfix
 2014-10-12 10:09:03 +02:00
Remie Richards
f673093ee5 Merge pull request #5135 from paprka/undershirtstake2 
Undershirts and jumpsuit overhaul
 2014-10-11 20:02:55 +01:00
paprka
6235cb3401 stun logging for telebaton 2014-10-11 09:29:44 -07:00
Swag McYolosteinen
cd60db5e18 Merge pull request #5124 from MrPerson/implant_action_button 
Give implants an action button
 2014-10-11 18:15:44 +02:00
phil235
3d0778e873 Small grammar fix. 2014-10-11 17:44:54 +02:00
Swag McYolosteinen
db23e13575 Merge pull request #5098 from tkdrg/loadingloading 
Wiki books now have a loading screen
 2014-10-11 14:29:46 +02:00
Swag McYolosteinen
cd78d2eb37 Merge pull request #4863 from Menshin/girders_building_consistency 
Consistency fix for disloged girders securing and building on
 2014-10-11 13:41:18 +02:00
MrPerson
863f28f295 On second thought, leave the result as just a path 
Fix up IED's so they work correctly when tablecrafted. Also remove their manual crafting.

Merge branch 'master' of https://github.com/tgstation/-tg-station into table_module

Conflicts:
	code/game/objects/structures/tables_racks.dm
 2014-10-10 14:30:41 -07:00
Remie Richards
b54ed5b4e5 Merge pull request #5137 from paprka/holosignoff 
Adds holographic janitor signs
 2014-10-10 17:41:41 +01:00
Remie Richards
b9f4a54c56 Merge pull request #5132 from paprka/tacticool 
Changes HUD in syndicate medkit to NV HUD
 2014-10-10 17:29:18 +01:00
Remie Richards
afb0808748 Merge pull request #5133 from paprka/glovestation 
Changes robotics gloves to fingerless gloves
 2014-10-10 17:26:40 +01:00
paprka
bfa448864b Added unique sound for knocking on glass 2014-10-10 09:07:23 -07:00
phil235
5fadf38aa6 Merge branch 'master' of https://github.com/tgstation/-tg-station into ed209fix 
Conflicts:
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/bots/secbot.dm
 2014-10-10 17:12:05 +02:00
phil235
f40edc5ce6 *FIX: the taser that ed209 drops on death looks full but is empty(need an update icon shit) 
*FIX: issue4487 (lasersound)

*Fix: repairing bot with weldingtool off. Gives warning msg.

*FIX: medbot fleeing one step when using weldtool/holosword.

*Fix: attacking silicon w/ holosword no longer gives spark.

*FIX: attacking bot w/ holosword is an assault.

*FIX: bots produce spark when damaged via attakby, similar to borgs.

*FIX: attacking ED209 with weldingtool on harm now triggers the bot response to the assault.

*FIX: bots can produce sparks when hit by projectile w/ damage>0. (to have some feedback b/c there's no msg otherwise)

*FIX: ED209 doesn't try to tase monkey despite wanting to arrest.

*FIX: LaserTAG ED209 points at monkey despite not shooting/hunting them.

*FIX: we don't check projectiletype and sound each time we fire. (Now only when using New() or emagging/hacking/emp'ing) (also

simplifying code)

*FIX: cannot access behavior mode to toggle patrol on lasertag ED209 (despite the fact that it should be able to patrol.

*FIX: ED209 tases cuffed target that are standing.

*FIX: ED209 can stun through a closet! And, it can cuff through windows and closet.

*FIX: the handcuffing problem. (issue2025)

*FIX: no message when trying to screwdriver panel of bots open but it's locked.

*FIX: added one audible message instead of for+show

*FIX: make 'detain' mean stun repeatedly. (issuenumber???)

*FIX: After finishing summon order, bot goes patrolling even if no auto_patrol.

*FIX: ED209 cannot be summoned or appear on the PDA securitron interlink cartridge.

FIX: autocustom names for lasertag ed209s doesn't work (if you don't give them a custom name, it gives them a custom one from a

list)

Removing maxstuns var in process() proc of both ED and beepsky. It doesn't do shit.
Lasertag ED no longer calls look_for_perp(), the loss in reaction speed is minimal. And it no longer calls for infraction
Adding myself as game master admin list.
 2014-10-10 16:34:26 +02:00
tkdrg
cc5a29b9fb Fixes tube pod decon & gives tubes two spin dirs 2014-10-09 19:18:35 -03:00
hornygranny
c55480af16 Merge pull request #5100 from Lo6a4evskiy/Armor_stripping_delay 
Stripping delay adjustments
 2014-10-09 13:46:59 -07:00
Swag McYolosteinen
7d11253f39 Merge pull request #4861 from Lo6a4evskiy/Custom_graffiti 
Choosing graffiti instead of drawing random one
 2014-10-09 16:31:13 +02:00
hornygranny
30b3294adc Merge pull request #5123 from paprka/zippycuffs 
Adds zipties
 2014-10-08 21:12:05 -07:00
paprka
149c9a3a76 big update 2014-10-08 20:58:43 -07:00
hornygranny
981df33b57 Merge pull request #5129 from paprka/hospatch 
Eyepatch HUD for HoS
 2014-10-08 19:50:53 -07:00
Francis Devine
5595d57f57 Add the click cooldown define to the last special defines 
This will stop these getting out of sync and let you change
all times with a single define
 2014-10-09 14:52:47 +13:00
Francis Devine
f737f7889c Defines for the define god 2014-10-09 14:49:28 +13:00
Remie Richards
23651b54f0 Merge pull request #5093 from paprka/medipens 
Replaces a lot of inaprovaline syringes with medipens
 2014-10-08 22:15:52 +01:00
paprka
b638daa384 oops 2014-10-08 13:52:21 -07:00
paprka
5457503c67 adds holographic janitor signs 2014-10-08 13:48:44 -07:00
paprka
16a0f12ffe fixes name stuff 2014-10-08 13:33:17 -07:00
paprka
d61e4ac943 big commit, handcuff overhaul 2014-10-08 13:19:54 -07:00
paprka
4c78323aa0 conflict resolution 2014-10-08 11:38:03 -07:00
paprka
b8eb9e3587 general code optimizations 2014-10-08 10:10:03 -07:00
paprka
18108257ae Merge branch 'undershirts' of https://github.com/paprka/-tg-station into undershirtstake2 
Conflicts:
	code/__HELPERS/mobs.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/mob/new_player/sprite_accessories.dm
 2014-10-08 09:48:49 -07:00
paprka
668bb52a1e Merge branch 'master' of https://github.com/tgstation/-tg-station into zippycuffs 
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
 2014-10-08 07:17:42 -07:00
paprka
8f9dfe0c5b code optimizations (thanks remie) 2014-10-08 07:12:00 -07:00
Lo6a4evskiy
98e04ca52e Merge remote-tracking branch 'upstream/master' into Armor_stripping_delay 
Conflicts:
	code/modules/clothing/spacesuits/miscellaneous.dm
 2014-10-08 16:45:22 +04:00
paprka
d80be7f689 changes robotics gloves to fingerless gloves 2014-10-08 05:11:30 -07:00