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
11,643 Commits 61 Branches 14 Tags
a122e156c4eefbb62b9aa4265574ebd9c2040ec8
Commit Graph

457 Commits

Author SHA1 Message Date
Cheridan
7c4ea04c36 Merge pull request #3478 from Jordie0608/unfastedagirlwhatdo 
Fixed typo in grille fastening
 2014-04-21 12:20:49 -05:00
Jordie
10ea2eb771 Fixed typo in grille fastening 2014-04-21 11:21:45 +10: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
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
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
ikarrus
2de4ffeb31 Committing what I have for now just in case. Also includes the new shuttle door type and added an airlock painter to the CE's closet. 2014-03-29 22:32:35 -06:00
Razharas
79d255be20 Merge pull request #3203 from MrPerson/qdel_table 
Make wrenching tables apart not drop the wrench
 2014-03-29 06:24:23 -07:00
Aranclanos
7bcb69ad88 Removes the click cooldown from almost everything, now it should be always be 0.1 seconds. 
Ranged weapons and laser eyes have a cooldown of 0.4.
Grilles, windows, windoors, walls and blobs have a cooldown of 0.8.
Hitting mobs will also have a cooldown of 0.8.
Removes the unused USEDELAY flag.
 2014-03-28 06:32:47 -03:00
MrPerson
481427a46f Make wrenching tables apart not drop the wrench 2014-03-26 20:34:08 -07:00
Ergovisavi
d55d72f049 Merge branch 'master' of https://github.com/tgstation/-tg-station into mineral_economy 2014-03-26 18:14:48 -07:00
Aranclanos
211d1ec509 Merge pull request #3173 from MrPerson/cream_of_torium 
Small rewrite of crematorium and morgue so they work right.
 2014-03-26 03:35:55 -03:00
Cheridan
3187be3e51 Merge pull request #3111 from Ikarrus/seclocks 
[MAP] Security Lockers Organization
 2014-03-25 11:00:48 -05:00
MrPerson
52b24f3549 Merge branch 'master' of https://github.com/tgstation/-tg-station into cream_of_torium 2014-03-25 04:42:10 -07:00
Incoming
6b83a8d2e0 I am crying. 
Merge branch 'master' of https://github.com/tgstation/-tg-station into toostat4tue

Conflicts:
	code/game/objects/structures/crates_lockers/closets/statue.dm
	code/modules/mob/living/simple_animal/hostile/statue.dm
	code/modules/projectiles/projectile/magic.dm
	tgstation.dme
 2014-03-24 22:13:43 -04:00
MrPerson
41042d5efd Small rewrite of crematorium and morgue so they work right. 
Only issue is that the damn things don't GC. Also lots of duplicate code between the two, still some other shittiness, but this is much better. I really just wanted to fix the bug where after usage you can't use em again until the tray gets deleted rather than GC'd.
On the plus side, they don't constantly make and delete trays every time someone opens them.

Also, and this is important, I uncommented the crematorium usage logging. It didn't runtime in testing so it should be good to go.
 2014-03-24 04:01:27 -07:00
Mloc-Hibernia
8af8a43d6f Initial pass to convert LF to CRLF 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
 2014-03-24 08:53:40 +00:00
Incoming
bab77f2538 Merge branch 'master' of https://github.com/tgstation/-tg-station into toostat4tue 
Conflicts:
	code/modules/projectiles/projectile/magic.dm
 2014-03-23 12:08:33 -04:00
Aranclanos
64c2138aa5 Merge pull request #3108 from TZK13/Bluebay-2-Electric-Bloogaloo 
[MAP] Bluebay 2: Electric Bloogaloo
 2014-03-22 20:01:55 -03:00
Miauw
a80dd4df0f Merge branch 'master' of https://github.com/tgstation/-tg-station into warnstandardization 
Conflicts:
	code/game/objects/items/weapons/AI_modules.dm
 2014-03-22 17:42:07 +01:00
TZK13
aa7ae999bd Fixes map and dmi conflicts as well as the obj suits dmi. 2014-03-22 02:33:36 -05:00
MrPerson
6930283efc Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r 
Conflicts:
	code/game/gamemodes/changeling/changeling_mutations.dm
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/malfunction/Malf_Modules.dm
	code/game/objects/items/weapons/tanks/watertank.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/research/server.dm
 2014-03-21 03:05:39 -07:00
Ergovisavi
d0ef73125a Various mining changes IE: mineral amounts per tile, mining mob stuff, mob anchoring, etc 2014-03-20 20:10:54 -07:00
ikarrus
ad8a374e06 [MAP] Security Lockers Organization 
-Moved spare HoS uniforms and backpacks into a separate wardrobe closet. This is mostly to reduce the content size of the HoS locker, making it easier to use.
-Moved sec backpacks into the security wardrobe closets.
-Moved Captain's formals down in the stack order so it doesn't get in the way of the items that are used more often. Alt uniforms should be stored on the bottom of the pile.
-Removed stealth change giving the Captain the super-robust dermal armor
 2014-03-17 23:55:08 -06:00
TZK13
e689130c03 Makes Greenbay into Bluebay, take two. 2014-03-17 22:25:57 -05:00
Aranclanos
5f42c17ee9 Tabling will not runtime if the target runs away from the grab anymore 2014-03-13 20:07:02 -03:00
ikarrus
c3eef7846b -Added Nienhaus's new HoP uniform and cap. Old sprites are renamed to hop_old 
-Removed HoP's spawning armor and moved the one in the locker higher up in order
-Glory to Nanotrasen
 2014-03-12 22:32:49 -06:00
Ikarrus
6147bf6053 Returned armor vest to the HoP's locker 2014-03-12 10:25:29 -06:00
ikarrus
fba4280ec2 Removes HoP's armor and helmet 2014-03-12 08:47:01 -06:00
fleure
b6e7155a24 Changed janitor and atmos tanks slightly 2014-03-10 20:27:21 +00:00
Cheridan
8423e6765c Merge pull request #3002 from Aranclanos/GrabOnLockers 
Grabs won't runtime anymore on lockers
 2014-03-09 16:10:20 -05:00
Miauw
8c172733a8 Standardizes and expands the warning() and error() procs. 2014-03-09 18:08:19 +01:00