cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-25 16:45:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,923 Commits 61 Branches 14 Tags
65602cb72d04cff7f3d205f90e10afabfefea300
Commit Graph

4732 Commits

Author SHA1 Message Date
Giacomand
65602cb72d Added admin logging for the gravity generator. 2014-03-25 10:12:33 +00:00
Giacomand
1a9da0ba47 You will fall over in zero gravity, but you won't make a noise. This was important because it told players whether someone was stunned or dead, when it was changed it just added confusion. 
You can no longer slip in zero g.

Added an admin subtype of the gravity generator which admins can spawn to create a pre-setup gravity generator.
 2014-03-23 16:21:08 +00:00
Cheridan
137085ebc6 Merge pull request #3146 from MrPerson/pai_cable_qdel 
No more message spam from pAI's.
 2014-03-23 00:08:33 -05:00
Cheridan
1d5b1fd468 Merge pull request #3148 from MrPerson/if_you_die_in_the_hallucination_you_die_for_rea 
Fixes the bug where players get deleted because of hallucinations.
 2014-03-23 00:07:11 -05:00
MrPerson
583787f70b Fixes the bug where players get deleted because of hallucinations. How the fuck did I screw this up so badly... 2014-03-22 21:55:52 -07:00
MrPerson
9bb2712440 No more message spam from pAI's. 2014-03-22 17:49:45 -07: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
Aranclanos
565f211155 Merge pull request #2937 from MrPerson/qdel 
qdel() garbage collection system [WIP]
 2014-03-22 04:49:58 -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
fleure
d41264e25c Merge pull request #3104 from Cheridan/stpatties 
Happy St Patrick's Day!
 2014-03-22 02:04:39 +00: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
fleure
26451b2e2c Merge pull request #3105 from MrPerson/gias_issue 
Safety check SMES custom input/output settings a bit.
 2014-03-20 20:13:24 +00:00
Ikarrus
9221473e2c Answered Aran's very good question 2014-03-18 21:42:59 -06: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
Razharas
41b13b4652 Merge pull request #3102 from Limeliz/patch-7 
Added an 'e' to 'Rest'. R&D computer
 2014-03-18 08:23:58 -07:00
ikarrus
e73586dadf Resolved Conflicts: 
code/modules/security levels/keycard authentication.dm
 2014-03-18 00:17:22 -06:00
Cheridan
ca348d8cb4 Merge pull request #3095 from Ikarrus/hopian 
Ian wearing the HoP Cap
 2014-03-17 23:56:16 -05:00
Cheridan
e8a69f7d37 Merge pull request #3072 from Aranclanos/MaintDoors 
Maint doors toggles fixes.
 2014-03-17 22:40:54 -05:00
TZK13
e689130c03 Makes Greenbay into Bluebay, take two. 2014-03-17 22:25:57 -05:00
MrPerson
6ec9e5b732 Safety check SMES custom input/output settings a bit. 2014-03-17 13:27:50 -07:00
Cheridan
1b55792638 Merge pull request #3087 from Aranclanos/HumanOverlays 
Human overlays will show themselves again.
 2014-03-17 15:23:24 -05:00
Cheridan
557236eb80 Happy St Patrick's Day! 
-Adds corned beef and cabbage
-Adds green beer

-Removes some old commented-out code
-Reorganizes food.dmi. PLEASE KEEP ANY FUTURE SPRITE ADDITIONS TO THIS FILE ORGANIZED OR I WILL CRY.
-Ghostburgers and Booberry Muffins now use Alpha var instead of different sprites.
 2014-03-17 15:15:58 -05:00
Emil
05203ba8a1 Added an 'e' to 'Rest'. R&D computer 2014-03-17 17:59:07 +01:00
Razharas
072b8d2bcb Merge pull request #3067 from Giacom/virus_food_mix 
Forgot to change the virus mix reaction, for blood + virus food, to 1 unit.
 2014-03-17 09:02:45 -07:00
Alex
8b4f076b17 Changed the required amount of blood to 1. 2014-03-17 14:35:09 +00:00
Perakp
e790ab3ab2 Merge remote-tracking branch 'upstream/master' into new_stings 2014-03-17 12:21:52 +02:00
ikarrus
f3f53181fc Ian wearing the HoP Cap. 
The most important update.

Also removes a rogue pixel in the human HoP cap sprite.
 2014-03-16 21:52:12 -06:00
Razharas
78a6a1c416 Merge pull request #3068 from Aranclanos/Profiles 
Profiles from client.
 2014-03-16 12:52:56 -07:00
Giacomand
615926b17e Shuttles changing location will update the area's has_gravity. 2014-03-16 09:17:38 +00:00
ikarrus
d065af8b8c Emergency Access Override Update 
-Changed the way emergency access override is handled. It now toggles a var which overrides access requirements instead of removing/adding access
-Airlocks now have blinking amber lights when in emergency mode
-AIs can toggle emergency override on individual doors
-Humans may disable emergency overrides by pulsing the ID scanner wire. They can't enable it, since IMO there are enough methods to hack open doors without an easymode all-access wire
 2014-03-15 14:59:39 -06:00
Aranclanos
e773eda145 Human overlays will show themselves again. 2014-03-15 17:31:07 -03:00
Giacomand
64c9e253f2 Typo fixes. I'm keeping the comma-less but. 2014-03-15 17:44:34 +00: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
Perakp
fa56f9892e Merge with master, dissonant shriek and organic space suit 
- Changed dissonant shriek and organic space suit from old verb system
to new system.
 2014-03-15 13:49:26 +02: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
Cheridan
50e7dbd71b Merge pull request #2986 from Miauw62/simpleanimalspeed 
Adjusts simple_animal speed to match recent human speed nerf.
 2014-03-14 01:32:09 -05:00
Aranclanos
6dffc8a72f The admin functions and comms console options to switch the level of access of the maint doors will now work properly and not runtime. 2014-03-14 01:57:42 -03:00
Rockdtben
a795589bfb Revert monkey/life.dm 2014-03-13 18:48:23 -05:00
Rockdtben
c9d12f4e39 Revert human/life.dm 2014-03-13 18:47:03 -05:00
Aranclanos
7b767c7c94 Added a new admin txt under the new cfg folder. The ckeys of this list will be able to make profiles on servers that they are admins. We welcome servers to change this list as it is a configuration file. Being on this list does NOT grant you any kind of admin powers. 
All admins will now have the control_freak disabled but for skin and macros, to make this work.
 2014-03-13 15:38:06 -03:00
Giacomand
50cfb1c18b Merge branch 'master' of https://github.com/tgstation/-tg-station into alt_override_machine 2014-03-13 16:40:04 +00:00
Giacomand
925b589f85 Forgot to change the virus mix reaction, for blood + virus food, to 1 unit. 2014-03-13 16:33:43 +00: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
Cheridan
7bb042b9c5 Merge pull request #3056 from Limeliz/patch-3 
GPS window gets variable height
 2014-03-13 10:55:03 -05:00
Rockdtben
a034e41f25 Removing TLE comment stamps and useless comments 2014-03-13 08:25:28 -05:00
ikarrus
6dd3403df3 -Updated on-mob sprites with a couple of quality fixes 
-Corrected the HoP and Captain's preview image in character setup
 2014-03-12 23:21:20 -06:00