cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-19 05:26:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,911 Commits 61 Branches 14 Tags
b1e2493b517ffd329646ad00a94f5f7bd5fa2fbe
Commit Graph

2666 Commits

Author SHA1 Message Date
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
TZK13
aa7ae999bd Fixes map and dmi conflicts as well as the obj suits dmi. 2014-03-22 02:33:36 -05:00
MrPerson
2858bf1c18 Fix for changling powers arm blade and fleshy space suit. 
More del(AM) -> qdel(AM) and Del() -> Destroy()
Fixes a terrible bug that would have meant players could only ghost once.
 2014-03-21 22:26:50 -07:00
MrPerson
ee716586b9 GEE THANKS GIA FOR MORE CONFLICTS (gravitygen changes to c4 vs qdel) 
Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r

Conflicts:
	code/game/objects/items/weapons/explosives.dm
 2014-03-21 19:04:51 -07:00
Razharas
4c4cadb48c Merge pull request #3086 from Giacom/gravity_generator 
[MAP] Added a new gravity generator which will produce gravity for the station.
 2014-03-21 14:06:40 -07: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
Cheridan
d2021e1bcd Merge pull request #3107 from Jordie0608/dancefloorisbetterthantheprancefloor 
Fixes wirecutters and multitools lacking attack sounds
 2014-03-20 11:19:14 -05:00
fleure
61a4ed7a4d Merge pull request #3114 from Ikarrus/borgname 
Allows roundstart cyborgs to select their own name
 2014-03-20 11:17:39 +00:00
Jordie
f32f81d5b5 Hitsound for rods 2014-03-20 15:43:39 +11:00
Cheridan
3eea5028a6 Merge pull request #3109 from Jordie0608/Childrenshouldntbeonaspacestationanyway 
Fixes HTML code showing up on mousetrap box desc.
 2014-03-19 10:50:43 -05:00
ikarrus
d97e7d84aa Allows roundstart cyborgs to select their own name 
But only if the option is enabled in the server config.

Credit to Neerti for originally coding this.
 2014-03-18 21:22:51 -06:00
Jordie0608
a5a9c2fd68 Changed mousetrapbox desc to span 2014-03-18 15:08:49 +11:00
Cheridan
1c0d32e6f8 Merge pull request #3069 from Aranclanos/TableRuntimeFix 
Tabling will not runtime if the target runs away from the grab anymore
 2014-03-17 22:32:17 -05:00
TZK13
e689130c03 Makes Greenbay into Bluebay, take two. 2014-03-17 22:25:57 -05:00
Cheridan
f0ea037a64 Merge pull request #3071 from Aranclanos/VaultSpawners 
Vaultspawners will now use ChangeTurf()
 2014-03-17 22:13:43 -05:00
Jordie
33e6f3f3c8 Screw off crowbar_red leave me alone 2014-03-18 11:29:46 +11:00
Jordie
3268033ba6 Hitsound for multitool 2014-03-18 11:28:47 +11:00
Jordie
36f6571b56 Hitsound for wirecutters 2014-03-18 11:24:06 +11:00
Giacomand
cc4dd68bdf Added a new gravity generator which will produce gravity for the station. 
Sprites by Ausop, which he posted in his sprite thread.

The gravity generator is very sturdy, as it is almost indestructible, but explosions can break it and it will need repairs.
Changed C4 to stop del()'ing and instead will only use ex_act().
Added an interact_offline variable for machines that will allow you to interact with them even if they are depowered. The gravity generator only uses this at the moment.

Removed the stun that people get when gravity changes.
Shuttles have gravity still.

Added a gravity generator room to the west of Engineering. It is very secure, with a foyer and requiring CE or Captain access. There are instructions on the table for repairing and enabling/disabling the machine.
 2014-03-15 16:59:48 +00:00
Cheridan
4e5d757726 Merge pull request #3064 from Rockdtben/removeTLEComments 
Removing TLE comment stamps and other useless comments
 2014-03-14 15:40:27 -05:00
Aranclanos
fcb3bc66c7 Vaultspawners (those things never used that an admin might once in a blue moon) will now use the ChangeTurf() proc and won't make Linda cry 2014-03-13 22:23:24 -03:00
Aranclanos
5f42c17ee9 Tabling will not runtime if the target runs away from the grab anymore 2014-03-13 20:07:02 -03:00
Cheridan
9f98e67545 Merge pull request #3058 from Ikarrus/nohopsec 
New Uniform for HoP
 2014-03-13 11:32:23 -05:00
Cheridan
16994a1ae2 Merge pull request #3057 from Rockdtben/removeComments 
Removed some of my useless comments from years ago.
 2014-03-13 11:14:42 -05:00
Rockdtben
a034e41f25 Removing TLE comment stamps and useless comments 2014-03-13 08:25:28 -05:00
Razharas
13454a78b2 Merge pull request #3054 from Limeliz/patch-2 
Fixing JMP-link in asay for C4 planting
 2014-03-12 22:35:01 -07:00
Razharas
eca26b70da Merge pull request #3049 from RandomMarine/dnainjectorupgrades 
Reduces DNA injector radiation based on its origin's upgraded parts.
 2014-03-12 22:34:01 -07: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
Rockdtben
6eeeb1e5fe Removed some useless comments from years ago. 2014-03-12 07:59:34 -05:00
Emil
59e5e4294f Fixing JMP-href in asay for C4 planting 
The JMP-link in the message_admins() when planting C4 on walls/doors etc always teleported admins to 0,0,0. It has been fixed now.
 2014-03-12 05:24:12 +01:00
Cheridan
f7337f1aa9 Merge pull request #3014 from fleure/tanks 
Added atmos and jani watertanks, changed nozzle types [MAP]
 2014-03-11 21:24:27 -05:00
RandomMarine
c03052aed8 DNA injectors get DNA scanner's damage_coeff. 2014-03-11 09:23:41 -07:00
Rockdtben
83334f07be Merge pull request #3041 from hornygranny/balancepass 
Buffs stun baton + classic baton
 2014-03-10 20:54:25 -05:00
fleure
b6e7155a24 Changed janitor and atmos tanks slightly 2014-03-10 20:27:21 +00:00
Hornygranny
02b8288589 Stun baton buffed, classic baton buffed 2014-03-09 16:46:55 -07:00
Hornygranny
4391b132c7 Revert "Increases most stuns 40% in length (now 7, up from 5, which was down from 10)" 
This reverts commit d550b3491b.
 2014-03-09 16:44:19 -07: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
Cheridan
19a9717ece Merge pull request #3010 from fleure/firtree 
Fixed typo in Tyrant AI lawset
 2014-03-09 15:15:21 -05:00
MrPerson
6b29fecda1 Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r 
Conflicts:
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/rechargestation.dm
	code/game/machinery/turrets.dm
	code/game/objects/structures/crates_lockers/closets.dm
	code/modules/research/circuitprinter.dm
 2014-03-08 22:03:03 -08:00
Steelpoint
55beb8c8b3 TakeTwo 2014-03-08 23:50:15 +08:00
Ergovisavi
062f368ce0 Merge branch 'master' of https://github.com/tgstation/-tg-station into stamina_loss 2014-03-07 04:24:51 -08:00
Hornygranny
d550b3491b Increases most stuns 40% in length (now 7, up from 5, which was down from 10) 2014-03-06 22:56:22 -08:00
fleure
026c991b95 Added atmos and jani watertanks, changed nozzle types 2014-03-07 01:13:19 +00:00
Fleure
4914ee6dc4 Fixed typo in Tyrant AI lawset 2014-03-06 17:18:57 +00:00
Aranclanos
fb64ae9a41 the vending refill objects won't runtime anymore at roundstart if they were placed in the map 2014-03-06 10:20:48 -03:00
Ergovisavi
a3ce04c000 Merge branch 'master' of https://github.com/tgstation/-tg-station into stamina_loss 
Item attack changes
 2014-03-06 03:17:02 -08:00
Aranclanos
ad3c76ef31 Grabs won't runtime anymore on lockers 2014-03-05 21:20:06 -03:00
Cheridan
a2fb8bc3eb Merge pull request #2983 from ChuckTheSheep/TC-Green-Text 
Fix  for Nuker's TC Green Text.
 2014-03-05 00:18:49 -06:00