cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-27 01:21:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,953 Commits 61 Branches 14 Tags
e87d84fbe403fca60616eb68382e97ccce5e2256
Commit Graph

483 Commits

Author SHA1 Message Date
Alex
bcac0812c5 Merge pull request #3585 from Aranclanos/ViolinAndPiano 
canUseTopic()
 2014-05-14 11:05:17 +01:00
Alex
084510a743 Merge pull request #3391 from Donkie/sofa 
Sofa / Comfychair update
 2014-05-14 10:37:06 +01:00
fleure
e13ab9422d Merge pull request #3610 from Aranclanos/washingmachine 
Washing machine fixes
 2014-05-13 16:55:26 +01:00
Cheridan
bd2756c36a Merge pull request #3580 from argoneuscze/fixshowerfire 
Fix shower not extinguishing fires
 2014-05-06 19:46:57 -05:00
Cheridan
9ae36480b2 Merge pull request #3618 from kyrahabattoir/ItemNameFixingRound4 
More name fixing, lowercasing objects, proper-ing unique objects, plural...
 2014-05-05 11:46:35 -05:00
Alex
6d337e760b Merge pull request #3592 from Aranclanos/reisinsuperconductivity 
Reisin walls and doors will now block superconductivity (heat)
 2014-05-03 23:11:13 +01:00
Miauw62
eec72aa516 Merge pull request #3472 from Menshin/missing_nodrop 
Nodrop  checks for several machines/structures
 2014-05-03 15:44:26 +02:00
Alex
b3b54d2561 Merge pull request #3607 from phil235/WindowDestroySoundFix 
Fixes the lack of sound when smashing window
 2014-05-02 17:40:37 +01:00
Kyrah Abattoir
997e1310c5 More name fixing, lowercasing objects, proper-ing unique objects, plural-ing some stuff that needs it. 2014-05-01 23:07:35 +02:00
Aranclanos
b544a945a9 Fixes issue #2489 
Fixes issue #119

Transferred all the different colours of under clothes and shoes to obj/item/clothing/under/colour/XXX and obj/item/clothing/shoes/sneakers/XXX
Added two extra options to the spawn menu of the game panel, clothing and food.
 2014-05-01 06:01:14 -03:00
phil235
0233cd3a25 Fixes the lack of sound when smashing window 2014-05-01 01:43:09 +02:00
Aranclanos
cc34aae3e3 Reisin walls and doors will now block superconductivity (heat) 
Reisin membranes won't
 2014-04-30 07:40:41 -03:00
Aranclanos
5736eb1f44 Creates canUseTopic(), a mob proc contained for the moment in the machinery.dm 
The Topic() proc of machinery will use this.
The first non-machinery item to use this will be the violin and piano.
There are plans to make admin observers use this, to make AIs don't be able to use Topic() when they lose power (doing that currently will break gameplay) and make all items use the canUseTopic() proc if needed.
I just wanted to pull the fix for the piano and violin quick, the rest is a todo.
 2014-04-30 05:25:01 -03:00
argoneus
d08c9ebc08 Fixed #3571 2014-04-29 21:38:38 +02:00
Cheridan
686e879f2e Merge pull request #3490 from Giacom/fixes_transit_tubes 
Fixes transit tubes being stuck, it uses process() instead of a spawn'd loop.
 2014-04-24 23:07:52 -05:00
Daniel
7e06da72d1 Fixed armrest being an icon instead of image 2014-04-24 18:18:57 +02:00
Giacomand
d42aa1e28a Fixes a typo. 2014-04-21 21:00:23 +01:00
Cheridan
7c4ea04c36 Merge pull request #3478 from Jordie0608/unfastedagirlwhatdo 
Fixed typo in grille fastening
 2014-04-21 12:20:49 -05:00
Giacomand
016889bfc0 Fixes transit tubes being stuck, it uses process() instead of a spawn'd loop. 
Segmented the transit tube code into its own folder and code files, for each part of the tube.
 2014-04-21 15:44:50 +01:00
Jordie
10ea2eb771 Fixed typo in grille fastening 2014-04-21 11:21:45 +10:00
Menshin
80e7d1d0e7 Added a check for "_nodrop_" items for several machines/structures (fix #3407). 2014-04-20 20:49:32 +02:00
Ergovisavi
f302adc8ab Merge branch 'master' of https://github.com/tgstation/-tg-station into mineral_economy 2014-04-16 16:58:28 -07:00
ikarrus
b800d97e3c Changed execution chamber access to access_hos, removed bolt controls 2014-04-13 13:51:30 -06:00
Daniel
4b2679264b Removed the separate feet icon 
It did nothing anyways
 2014-04-10 19:22:04 +02:00
Daniel
d8a1dc637f Minor cleanup 2014-04-10 19:19:06 +02:00
Jordie0608
b18cc7d54e Merge branch 'master' of https://github.com/tgstation/-tg-station into manidontevenknowwhatwentwrongwiththat 
Conflicts:
	code/game/machinery/doors/airlock.dm
	code/game/objects/structures/door_assembly.dm
	code/game/objects/structures/false_walls.dm
	code/game/objects/structures/mineral_doors.dm
	code/modules/research/protolathe.dm
	icons/obj/doors/door_assembly.dmi
 2014-04-11 02:51:07 +10:00
Daniel
9e1b89baa1 Cleaned up and simplified the code. 2014-04-10 17:01:07 +02:00
Daniel
192b1d91a8 Readded argument, cleaned up rollerbed code 2014-04-10 15:43:03 +02:00
Daniel
5f30e1d8ad Removed unneeded argument 2014-04-10 15:35:58 +02:00
Daniel
1e5b817eb1 Added armrest overlay 2014-04-10 15:34:57 +02:00
Daniel
b0b1e5aff7 Added custom colorable sofas 2014-04-09 22:30:45 +02:00
Steelpoint
35950b90fd SecMapChangeV3 2014-04-09 19:17:11 +08:00
Miauw
5abb553f4a Merge branch 'master' of https://github.com/tgstation/-tg-station into warnstandardization 
Conflicts:
	code/_onclick/telekinesis.dm
 2014-04-08 14:29:58 +02:00
Jordie0608
e58c90696a Hopefully merge conflict fixes 2014-04-07 21:46:06 +10:00
ikarrus
f4c327ba26 Updated the godawful Airlock Electronics interface 
Also added the ability to set if the door should require ALL listed accesses, or just one.
 2014-04-06 15:04:31 -06:00
Miauw62
447bf56908 Merge pull request #3313 from Aranclanos/FalseWalls 
Works with falsewalls and plasma asay logs.
 2014-04-05 20:20:51 +02:00
Aranclanos
53026a2483 Fixed the feedback messages for when you try to make a false wall with insufficient sheets. 
Merged the open/close close from false walls walls and reinforced false walls into one.
 2014-04-05 15:03:27 -03:00
Rockdtben
f6906addb2 Merge pull request #3285 from Steelpoint/JaniBelt 
Adds the janibelt!
 2014-04-04 08:10:21 -05:00
Aranclanos
7c93c1229f Removed a spawn() from the Destroy() proc of falsewalls. 
Removed the falserwall type, now reinforced walls are a subtype of falsewalls.
Due to that, removed a bunch of copypasted code.
Falsewalls now spawn closed.
Falsewalls open/close timers are now proper, regarding their animation times.
You can't use a screwdriver on falsewalls while they aren't on a floor. (excluding shuttle floors)
Fixes issue #2338
Plasma falsewalls will now ignite.
Added a feedback message when you don't have enough sheets to create a falsewall.
Admin logs for igniting plasma walls, falsewalls, doors and airlocks.
Stadarized mineral_doors.dm.
 2014-04-04 09:18:39 -03:00
Miauw62
47c463d0b2 Merge pull request #3276 from MrPerson/play_me_a_song_piano_man 
Make violin stop cutting off other sounds
 2014-04-03 20:26:58 +02:00
Cheridan
4dc2ccce1f Merge pull request #3266 from phil235/FireAxeCabineFix 
Fireaxe cabinet hacking now fails if player moves away
 2014-04-02 21:26:37 -05:00
Miauw62
fc0f56a8c6 Merge pull request #3274 from Aranclanos/DermalPatch 
Added back the dermal patch to the HoS locker.
 2014-04-02 19:46:12 +02:00
Steelpoint
f45391a838 JaniBelt implementation 2014-04-03 01:30:02 +08:00
Razharas
b700f39509 Merge pull request #3272 from Ikarrus/boxupdate 
[MAP] "Boxstation" v2.1.3
 2014-04-02 05:54:12 -07:00
MrPerson
19d00b96f0 Make violin stop cutting off other sounds 2014-04-02 05:23:00 -07:00
Aranclanos
449c3655da Added back the dermal patch to the HoS locker. 
For some reason this item keeps getting stealth changes lately.
 2014-04-02 04:50:16 -03:00
phil235
d58ee721dc Changing user messages to use span class stuff. 2014-04-01 23:06:51 +02:00
phil235
06dcf22a49 Fireaxe cabinet hacking now fails if player moves away 
Removes the ability to run away right after initializing the cabinet hacking with a multitool and still successfully finish the hacking(and seeing the hack message).

Also, playing the relocking sound at the beginning of the hacking instead of the end for consistency with the unlocking hack.
 2014-04-01 22:04:08 +02:00
Jordie0608
79746e115f Wooden Walls 2014-04-01 18:03:02 +11:00
Miauw
dc9ead6575 Merge branch 'master' of https://github.com/tgstation/-tg-station into warnstandardization 
Conflicts:
	code/_onclick/telekinesis.dm
	code/game/sound.dm
 2014-03-30 20:48:03 +02:00