cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-02 13:02:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,502 Commits 60 Branches 14 Tags
ec44b2fde8d90cd60fa8ff83b4375cd34799ac7e
Commit Graph

3623 Commits

Author SHA1 Message Date
Giacom
ec44b2fde8 Merge pull request #1781 from JJRcop/borg-tweaks 
Cyborg consistiency, deconstruction tweaks
 2013-11-16 12:15:42 -08:00
Giacom
2349992598 Merge pull request #1786 from d3athrow/master 
Fixes exploit fix, exact amount of materials will allow building now.
 2013-11-15 10:25:49 -08:00
Cheridan
5ccbc0e1bd Merge pull request #1755 from Atskadan/chaplainrobes 
Lets chaplains hold their religious items in their robes
 2013-11-15 08:14:16 -08:00
Giacom
a8c3bb2b44 Merge pull request #1782 from JacobLee1/master 
Ambrosia wreaths
 2013-11-15 06:26:36 -08:00
Cheridan
16b2bc833f Merge pull request #1753 from Giacom/tele_sci_tweak 
Telescience Update
 2013-11-14 15:30:01 -08:00
d3athrow
ba3aa59cc4 Fixes exploit fix, exact amount of materials will allow building now. 2013-11-14 14:10:20 -06:00
JacobLee1
8133912928 Ambrosia wreaths 
Lets you put ambrosia leaves on your head, olive wreath style. Cue SS13
Olympics. Hopefully security doesn't beat you up and confiscate it.
http://i.imgur.com/58aEHUw.png
 2013-11-13 17:53:45 -06:00
JJRcop
1243552f6b Resolved "cover" vs "panel" terms conflict in cyborgs, "cover" wins 
Correcting every instance of calling the "cover" a "panel".
Also, tweaks to cyborg deconstruction so it's more forwards-compatible.
 2013-11-13 18:50:30 -05:00
Giacomand
79cc8eeca3 * Ghosts can now be teleported again! 2013-11-13 20:06:31 +00:00
Cheridan
bc7b8b8e64 Merge pull request #1762 from fleure/watertanktwo 
Added watertank backpack and put on map
 2013-11-12 19:11:34 -08:00
Giacom
2037e6ec2c Merge pull request #1750 from YotaXP/Kill-Status-At-Login 
Removes the empty Status tab that is active by default at login.
 2013-11-12 11:52:40 -08:00
Giacomand
0824bbd599 * Tidied up the code. 
* Changed some code to use the teleport datum features.
 * Fixed a broken check in the teleport datum.
 2013-11-12 19:49:36 +00:00
Giacomand
05f211f0c3 * It is now impossible to teleport to the away missions, through telescience. 2013-11-12 19:09:56 +00:00
Giacomand
5043091b72 * Lowered the origin and required tech for the bluespace crystals. 
* Commented out the distance value that you receive, making it harder when calculating.
 * Added materials to the origin tech (organic crystal only) and raised material required to make new bluespace crystals.
 2013-11-12 18:36:30 +00:00
Cheridan
5684933189 Merge pull request #1745 from errorage/2013-11-10-Adds-Admin-List 
Adds admin list view to secrets tab
 2013-11-12 09:38:07 -08:00
Giacomand
b8c031026c * Telescience now works on bluespace crystals, which are special crystals which unlock power settings from the telescience computer. 
* The telescience computer starts with 3 artificial crystals.
 * The crystals can be crushed to blink or you can throw it at someone to make them blink a short distance.
 * You cannot teleport the AI or any anchored mob (unless they are buckled to an office chair).
 * You can make the bluespace crystals from slimes or from research.
 2013-11-12 14:24:56 +00:00
Cheridan
db0901db10 Merge pull request #1751 from Miauw62/imalazyass 
Fixes missing !'s and inverted messages.
 2013-11-11 18:48:37 -08:00
Giacomand
6aba9a096d * Rounds the time. 2013-11-11 22:13:39 +00:00
Giacomand
72b695e7c2 * Rounded the distance and seconds. 
* Removed obfuscation.
 2013-11-11 21:21:29 +00:00
Giacomand
d67c3704a5 * Added an angle offset, to make it even harder to use telescience. 
* Obfuscated the distance a bit.
 2013-11-11 21:18:35 +00:00
Cheridan
eb3a4e80ad Merge pull request #1747 from YotaXP/NanoUI-APC 
Implements NanoUI for APCs
 2013-11-11 11:38:36 -08:00
fleure
c860235a51 Added watertank backpack and put on map 2013-11-11 19:08:37 +00:00
Giacomand
799f39c7fd Fixes some bugs. 
Rotation offset is enabled.
Angles use only one decimal place now.
 2013-11-11 18:53:45 +00:00
Atskadan
432c51cc19 Adds holiday priest suit to the list, I forgot it. 2013-11-11 01:06:02 -06:00
Atskadan
3ac3a6adf5 Allows chaplains to hold religious stuff in their robes, also emergency oxygen tanks. 2013-11-11 00:56:32 -06:00
Atskadan
9384537436 Stuff 2013-11-11 00:30:05 -06:00
Cheridan
94e4574c9a Merge pull request #1744 from fleure/lemonlime 
Adds sprite for lemon-lime in a glass
 2013-11-10 20:34:17 -08:00
Giacomand
364eaa318c * Small bug fixes. 
* Added some code for offsetting the bearing, not used yet.
 * Runtime fixes.
 * Fixed teleporter teleporting AI eyes.
 2013-11-11 00:21:59 +00:00
Miauw
0a18413fb6 Fixes missing !'s and inverted messages. 2013-11-10 21:42:32 +01:00
Pete Goodfellow
adc67642d4 Merge pull request #1737 from Giacom/tele_sci_change 
Telescience now uses projectile trajectories to calculate the tile to teleport to! [MAP]
 2013-11-10 07:03:43 -08:00
Giacomand
f635ad3dc1 Changed the distance measurement from feet to meters. 
GPS will now take the first 4 characters, instead of rejecting large texts.
 2013-11-10 15:02:08 +00:00
Giacomand
0d0997b5f2 GPS will now uppercase all new tags. 
Elevation now starts at 45 degrees.
 2013-11-10 14:36:19 +00:00
YotaXP
d1827c6466 Removes the empty Status tab that is active by default at login. 
Has no effect for admins.
 2013-11-10 01:53:59 -05:00
AlexanderUlanH
b66d64ea9e Re-beautified mining 
Caves now update properly, with no inconsistent overlays on space tiles.
 2013-11-10 00:09:57 -05:00
YotaXP
139d045b0c Implements NanoUI for APCs, and make a couple other tweaks to the NanoUI framework. 
AI can also toggle the APC lock for human access.
 2013-11-09 22:02:06 -05:00
errorage
3537b5ea9a - Added an option to the secrets tab which displays the current list of admins and their ranks. 2013-11-10 02:52:41 +01:00
Fleure
bd9b00ebb8 Adds sprite for lemon-lime in a glass 2013-11-10 00:26:18 +00:00
Giacomand
1ee41eb995 * Added sound effects for charging and teleporting. 
* Cleaned up the UI so it doesn't move around.
 * You can now enter -90 into the bearing to get 270.
 2013-11-09 21:56:10 +00:00
Giacom
c25f14e74d Merge pull request #1659 from sawu-tg/master 
Food additions
 2013-11-09 13:24:29 -08:00
Giacomand
f7e662e883 Merge branch 'master' of https://github.com/tgstation/-tg-station into tele_sci_change 
Resolved Conflicts:
	code/__HELPERS/game.dm
 2013-11-09 18:43:55 +00:00
Giacomand
1e9ede42ee * Renamed rotation to bearing. 
* Renamed angle to elevation.
 2013-11-09 18:33:39 +00:00
Aranclanos
6177c28bbe Merge pull request #1687 from Giacom/alien_candidate 
When the game tries to find players for roles it will now prioritize players who are the least afk
 2013-11-09 10:18:44 -08:00
Aranclanos
2295080ea3 Merge branch 'medmech' of https://github.com/fleure/-tg-station into medmech 
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
 2013-11-09 15:14:48 -03:00
Giacomand
0c5cd7d8ac Telescience now uses projectile trajectories to calculate the tile to teleport to. 
The user can set a rotation (the direction the teleport will send him), the power (the amount of power the telepad will use, basically the x velocity) and the angle (which is the y velocity).

The random factor is that the power is randomly offset everytime you recalibrate the telepad.

There is a delay between each use of the teleport, which is calculated by the time it takes for a projectile to hit a destination.
There is also a delay determined by the amount of power you use.

Added a manual for telescience, which links to the wiki.
 2013-11-09 15:03:23 +00:00
Miauw
3f8f3c971a Undoes changes to emitter.dm & field_generator.dm in my other commits, then applies bugfix. 2013-11-09 15:35:40 +01:00
Miauw
5ad9505ef4 [MAP]Fixed space-fastening properly. 
Conflicts:
	code/modules/power/singularity/field_generator.dm
	maps/tgstation.2.1.2.dmm
(What is this I don't even)
 2013-11-09 14:42:54 +01:00
Giacomand
fbd79a6c02 Initial commit for telescience which uses projectile trajectory to obtain a destination coordinate. 2013-11-09 13:02:15 +00:00
Giacomand
c27070ff18 Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/1704 
Conflicts:
	maps/tgstation.2.1.2.dmm
 2013-11-08 22:55:23 +00:00
Cheridan
2c4f15bdbd Cleaned up the UI and fixed bugs. 
fixed up the GPS lists.

Added another Telescience area.

Fixed one final bug.

fixed some bugs

fixed a bug

Fixed a fuck ton of Bugs and Issues. Heavy thanks to SuperSayu for helping fix the code, along with Giacom.

Added 2 new Telescience only areas, and gave the BIG BAD BADMINS a investigate log each time someone teleports with Telescience. This logs the destination coordinates and the area it was in.

Fixed some bugs, and set the new stuff on a BRAND NEW 7th Z-LEVEL! Now you guys cant get to it falling out of the shuttle anymore.

Fixed some bugs.

Added Cosmic Anomalies on the empty Z-Level for you to find during Telescience! I also fixed some bugs.

Fixes a bunch of bugs. Don't pull yet, Telescience stuff is on the way!

fixed another issue

Fixed more issues

Fixed issues.

Adds Telescience! It is also added to the map where Misc. Research was.

Merge pull request #1682 from Giacom/active_player_serverstatus

Adds the active players for when you are getting the server status.
 2013-11-08 22:54:34 +00:00
Giacom
36b6e08ec6 Merge pull request #1715 from AlexanderUlanH/labor-remap 
Labor remap/Bugfixes [MAP]
 2013-11-08 12:30:39 -08:00