cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-20 22:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,348 Commits 61 Branches 14 Tags
7b2dc3fe73e909487e2c8b3f1d468b6fbb4e2a2d
Commit Graph

6043 Commits

Author SHA1 Message Date
duncathan salt
7c76c0ddbb Merge pull request #14887 from neersighted/Byond509 
Byond509
 2016-01-26 01:57:42 -06:00
Razharas
01831fc8eb Merge pull request #14862 from KazeEspada/LizardHunting 
Lizard hunting
 2016-01-26 08:01:11 +03:00
duncathan salt
f9f6fa2f4d Merge pull request #14802 from Incoming5643/heremembers 
Local Bird Transcends Round Based Universe
 2016-01-25 19:32:04 -06:00
Remie Richards
87f60ad691 Merge pull request #14843 from neersighted/tgui 
mo' tguis: electric boogaloo
 2016-01-25 22:22:29 +00:00
tkdrg
21ddc03148 Merge pull request #14850 from ChangelingRain/forceholo 
Guardians use forcemove where possible
 2016-01-25 18:49:55 -03:00
Bjorn Neergaard
e750a06cde Remove old helper, fix tank dispenser icons. 2016-01-25 12:03:15 -06:00
Bjorn Neergaard
f1c08e607d Exclude speech bubbles from rotation 
Fixes #14664
 2016-01-24 23:40:50 -06:00
Remie Richards
94f1b51893 Renames appearance flag defines. 2016-01-24 23:26:14 -06:00
Remie Richards
f4bb5fcf0e Min compiler version is now 509, Weapon hit indicators and Progress bars no longer colour/rotate/match the alpha of the atoms they are attached to. 2016-01-24 23:22:12 -06:00
KazeEspada
f4dc133be1 Merge branch 'master' of https://github.com/tgstation/-tg-station into LizardHunting 2016-01-24 20:52:04 -07:00
KazeEspada
004f081cb9 Lizards now hunt from a list. 2016-01-24 20:51:46 -07:00
Cheridan
b3240416b4 Merge pull request #14798 from MrPerson/come_on_guys 
Fixes some awful defines to not be hacks
 2016-01-24 21:15:14 -06:00
KazeEspada
17fe36ebda Merge branch 'master' of https://github.com/tgstation/-tg-station into LizardHunting 2016-01-24 15:14:00 -07:00
KazeEspada
b774041648 Lizards now hunt and kill insects, they swallow them whole. 
"We vorestation now." -Iamgoofball.
 2016-01-24 15:13:46 -07:00
Nerd Lord
3981022c2b Fixes two issues(KOOOOOOOOR) 2016-01-24 15:35:47 -05:00
duncathan salt
0d5885a1f0 Merge pull request #14819 from KorPhaeron/polymorph 
Polymorph Fixes
 2016-01-24 13:08:11 -06:00
duncathan salt
5e8f4a7679 Merge pull request #14734 from KorPhaeron/night_vision 
Fixes ranged guardian light
 2016-01-24 13:06:10 -06:00
duncathan salt
10788ec515 Merge pull request #14785 from AnturK/aicardgui 
Adds AI card tgui
 2016-01-24 10:53:34 -06:00
tkdrg
0f6bb2d0dc Merge pull request #14723 from AnturK/notsorandomfixes 
Fixes
 2016-01-24 13:46:42 -03:00
tkdrg
b8ecaa07ea Merge pull request #14791 from AnturK/mindswapfixes 
Mindswap fixes
 2016-01-24 13:31:51 -03:00
AnturK
d2be78ab6c Refactors renaming a bit 2016-01-24 12:56:50 +01:00
AnturK
330684df11 Fixes constructed AI's not getting their preferred name 2016-01-24 12:56:03 +01:00
AnturK
9e8eca56a7 Adds AI card tgui 
Removes the multiple AI's on one card semi feature.
 2016-01-24 12:52:31 +01:00
Razharas
42cb52d9e2 Merge pull request #14793 from xxalpha/foamistransparent 
Make foam transparent and cover everything including mobs.
 2016-01-24 07:26:11 +03:00
KorPhaeron
43fd76b7d4 Forgot to update the check 2016-01-23 13:43:52 -06:00
KorPhaeron
19084954ab Proper night vision toggle 2016-01-23 13:13:29 -06:00
KorPhaeron
45e541146b Drone fix 2016-01-23 13:07:52 -06:00
Carl Ivanov
89f9556b26 Fix 2016-01-24 00:39:13 +09:00
bear1ake
6972a21830 Fix for #14804 
Thanks to phil235
 2016-01-24 00:22:57 +09:00
Incoming
2bf128232d Gives Poly a rudimentary savefile (not committed, will be generated at data/npc_saves/Poly.sav) that allows him to retain his learned phrases between rounds. 
Poly can keep up to 20 unique phrases (plus his defaults) at a time. If poly learns a 21st phrase (and eventually this would be any learned phrase) it will randomly remove one of the other 20. The default phrases can't be unlearned this way.

Poly unloads his memories when killed or as the game ends.

This mechanic is unique to Poly, normal parrots won't share his phrase list. He's also been made a little chattier than other parrots to flaunt this ability
 2016-01-23 01:06:42 -05:00
MrPerson
e1b3815539 Fixes some awful defines to not be hacks 2016-01-22 19:07:37 -08:00
Bjorn Neergaard
1599742f7e Re-structure tgui's ui_act 2016-01-22 19:25:36 -06:00
Bjorn Neergaard
4224c800f0 Rewrite cryo 
Similar balance but now healing is all in the reagent; and code is much simplified
Remove cryo leaking air, it just consumes O2 now. Gasses with a higher
specific_heat can be used to improve efficiency.
Greatly buffs cryo upgrades, in return for slight decrease in un-upgraded
performance due to atmos simulation.

Fix canister relabeling icons (Fixes #14742)

Add wrench sound to portable_atmospherics (consistency with ATMOSPHERICS/components)

Fix blood directly setting oxyloss (now uses adjustOxyLoss, balanced to be ~same as before)
 2016-01-22 19:25:34 -06:00
Bjorn Neergaard
b2629a56e2 Make wires use defines, put a wire var on /atom, fix tgui ui_host runtimes 2016-01-22 19:25:33 -06:00
Bjorn Neergaard
87b0857b93 Refactor wire datums 
Finish wire port and refactor wire datums to use string keys; widen color
range to support more wires and more colors.
 2016-01-22 19:22:09 -06:00
tkdrg
c26a9488d4 Merge pull request #14762 from AnturK/botradiofix 
Fixes Pingsky Radio
 2016-01-22 21:34:17 -03:00
Remie Richards
6df21ac81f Merge pull request #14764 from ChangelingRain/slimeconsume 
Slimes can no longer feed on simple animals that are immune to clone and toxin damage
 2016-01-23 00:28:29 +00:00
xxalpha
32947c4cec Changed it so bots are all on the mob layer. 2016-01-23 00:15:13 +00:00
AnturK
12b9993b0a Fixes mindswapping into AI 2016-01-22 23:41:47 +01:00
Nerd Lord
dc6ecbe8f3 missed one 2016-01-20 15:51:33 -05:00
Nerd Lord
cd249d41f3 Slimes can no longer feed on simple animals that are immune to clone and toxin damage 
Simple animal damage procs return the damage done(as one would expect)
 2016-01-20 15:38:58 -05:00
Menshin
f5b619147a Fixes lag on new player login. 2016-01-20 19:50:46 +01:00
AnturK
b879d40f04 Fixes Pingsky Radio 2016-01-20 16:39:57 +01:00
duncathan salt
7ea17e7925 Merge pull request #14743 from neersighted/mo_tguis 
tgui: fix-22
 2016-01-19 23:40:04 -06:00
xxalpha
346c698162 conflict fix 
FORWARD SLASH
 2016-01-19 23:06:23 +00:00
Bjorn Neergaard
1c34479376 Fix uplink code once and for all 
Fixes #14733
 2016-01-19 16:42:57 -06:00
xxalpha
aff9db930d Merge remote-tracking branch 'upstream/master' into emaggedbots 2016-01-19 14:38:26 +00:00
duncathan salt
410885e609 Merge pull request #14709 from xxalpha/thiswasalreadyfixed 
jump to area uses safepick
 2016-01-19 07:26:33 -06:00
duncathan salt
f9e35f1695 Merge pull request #14706 from xxalpha/straightouttajacket 
Fixes the straightjacket
 2016-01-19 07:24:51 -06:00
KorPhaeron
52ea5c5c63 Ranged Guardian 2016-01-18 22:09:00 -06:00