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
8,519 Commits 61 Branches 14 Tags
75ff8338b84dd3603ccda80ac1edaf6e4bbbc7fc
Commit Graph

6797 Commits

Author SHA1 Message Date
Robson Richards
75ff8338b8 Fixes bible spam 
Fixes "r_arm" nonsense
Fixes appendicitis carrying over to robotic chest
 2013-11-24 15:24:55 +00:00
Robson Richards
44bf98d1fd Invert's a check that I accidentally edited 
Full type path for a list variable
 2013-11-20 18:31:52 +00:00
Robson Richards
ea7db2239d Adds a necessary check against surgeries on Robotic organs 
Reworks limb surgery/limb augmentation.dm to use a Switch

Ignore changes to do with "Requires_organic_chest" I removed it, but since re added it as it was preventing an exploit
 2013-11-20 18:19:22 +00:00
Robson Richards
e71ea3289e Merge branch 'master' of https://github.com/tgstation/-tg-station into 13/10/2013-Limb/organ-stuff 
This probably broke everything... :(
 2013-11-17 18:09:14 +00:00
Robson Richards
890362a61a Commiting some soft Updates of commits I'm behind on and Committing the rest via git. 2013-11-17 18:02:43 +00:00
Cheridan
dab0bf90d7 Merge pull request #1795 from Giacom/DA_quickfix 
Quick bug fix with latejoin double agents.
 2013-11-17 02:34:44 -08:00
Giacom
ec44b2fde8 Merge pull request #1781 from JJRcop/borg-tweaks 
Cyborg consistiency, deconstruction tweaks
 2013-11-16 12:15:42 -08:00
Robson Richards
637c3f7f63 Fixes for @Aranclanos 
Diseases now have a requires and a required_limb variable
if requires is 1 then it will run a check for required_limb (WHICH USES TYPEPATHS)

Reverts a turret change that git through into the pull for some reason

added some feedback messages in certain places

removed the hulk-like snowflake check that was really crappy anyways

Reworked a part of surgery/surgery_step.dm to use a switch
 2013-11-16 18:13:41 +00:00
Giacomand
1bed8ca493 * Quick bug fix with latejoin double agents. 2013-11-16 00:08:44 +00: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
Cheridan
3004a6705a Merge pull request #1619 from Giacom/latejoin_doubleagent 
Latejoin Double Agents [READY]
 2013-11-15 08:08:25 -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
Giacom
16fb3f355c Merge pull request #1774 from Cheridan/NukePR 
TC Console Logging & Bugfix
 2013-11-13 11:15:41 -08: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
Cheridan
fbe0fc9405 TC Console Logging & Bugfix 
-No longer possible to delete an uplink by adding another uplink to the uplinker console.
-Boss console now logs transfers, which should hopefully prevent swindling from less scrupulous agents.
 2013-11-12 14:42:40 -06:00
Giacomand
f5524abd66 * Eh, found a bug where if you try to setup the round multiple times then it will keep multiplying the config var. Made it calculate it in every instance of it being used. 2013-11-12 20:27:54 +00: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
Giacom
4d71912c3f Merge pull request #1739 from Ikarrus/fucklasers 
Moves laser pointer to special steal objectives list
 2013-11-12 03:44:49 -08:00
Cheridan
db0901db10 Merge pull request #1751 from Miauw62/imalazyass 
Fixes missing !'s and inverted messages.
 2013-11-11 18:48:37 -08:00
fleure
364992496b Fixed nozzle not filling from sink. 2013-11-12 00:02:29 +00: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
295f006abd Merge pull request #1741 from errorage/2013-11-09-Adds-Gamestate-to-Status-Ping 
Adds gamestate to status query.
 2013-11-10 22:07:15 -08: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
Cheridan
69fb024459 Merge pull request #1664 from Nienhaus/master 
New AI Status icons, Sal and Hal 9000
 2013-11-10 13:42:29 -08:00
Cheridan
b2b9aea469 Merge pull request #1733 from JJRcop/borg-decon-dumb 
Adds instructions to deconstruct cyborgs into Cyborgs for Dummies
 2013-11-10 13:39:31 -08:00
Miauw
0a18413fb6 Fixes missing !'s and inverted messages. 2013-11-10 21:42:32 +01:00
Robson Richards
ad0081e275 New Human EMP_act 
Old one was shite and I broke it somewhere
 2013-11-10 16:20:20 +00: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