cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-19 13:35:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,497 Commits 61 Branches 14 Tags
f001077b1a148165c8def6ecabfa7d1f911cbf9b
Commit Graph

13386 Commits

Author SHA1 Message Date
PKPenguin321
f001077b1a fixes the extraneous line removals 
hopefully
 2016-01-30 15:54:39 -08:00
PKPenguin321
1b4b672af9 carrot shivs 
git went rough on my ass and im not happy about it
 2016-01-29 22:05:47 -08:00
Razharas
0826128459 Merge pull request #14698 from Firecage/absolutepathsandifs 
Absolute paths and changes one liner if's/else's/else if's.
 2016-01-29 03:15:12 +03:00
tkdrg
a5c3e3a746 Merge pull request #14888 from KorPhaeron/RED_UNZ_GO_FASTA 
Red xenobio paint now works on vehicles
 2016-01-28 20:38:15 -03:00
KorPhaeron
7e0fb61c1e Adds spaces to return ..() 2016-01-28 16:38:37 -06:00
tkdrg
9ac73a85f8 Merge pull request #14702 from tgstation/RemieRichards-callproc-improvement 
callproc now outputs the contents of returned lists instead of /list
 2016-01-28 18:57:13 -03:00
tkdrg
e49a0877b5 Merge pull request #14964 from Jordie0608/firsticonsideredfancysqlthendecidedonasimplermethodwhichidiscoveredalreadyexisted 
Fixes date change failing log ftp
 2016-01-28 18:52:42 -03:00
tkdrg
614ab6cd1c Merge pull request #14975 from KorPhaeron/cleanbot 
Fixes cleanbot doubled messages
 2016-01-28 18:33:25 -03:00
tkdrg
884091ca54 Merge pull request #14922 from PKPenguin321/patch-9 
makes paper bins use incapacitated() instead of a massive if()
 2016-01-28 18:29:23 -03:00
Razharas
8c0694463e Merge pull request #14853 from RemieRichards/MechaPilots 
Mecha pilots!
 2016-01-29 00:28:14 +03:00
tkdrg
767132b1c9 Merge pull request #14924 from PKPenguin321/patch-10 
fixes up some helmets
 2016-01-28 18:27:46 -03:00
Razharas
90fc9a8aad Merge pull request #15005 from neersighted/tgui 
Allow tgui input() to be 0, fix SMES components
 2016-01-28 22:35:57 +03:00
Bjorn Neergaard
f93822c195 Allow tgui input() to be 0, fix SMES components 
Fixes #14965
 2016-01-28 07:10:37 -06:00
Razharas
cabb43bcd1 Merge pull request #14955 from Incoming5643/heremembers 
Local Psuedosentient Bird: 'I am growing stronger'
 2016-01-28 07:57:34 +03:00
Razharas
28e1e1d3b3 Merge pull request #14948 from neersighted/uplink_fix 
Uplink fix
 2016-01-28 03:09:09 +03:00
KorPhaeron
b617ba1458 Fixes cleanbot doubled messages 2016-01-27 13:58:30 -06:00
Razharas
b1f9881c3b Merge pull request #14932 from KorPhaeron/ctf 
Fixes CTF Area
 2016-01-27 22:24:20 +03:00
PKPenguin321
952e475808 addresses some feedback, hoopefully makes it compile 
only part i'm not 100% sure about is the iscarbon, but whatever
 2016-01-27 10:01:49 -08:00
Firecage
d82f970234 Merge conflict fix 2016-01-27 17:38:42 +02:00
duncathan salt
fd6482f8cb Merge pull request #14905 from Razharas/Assembly 
Some assembly requaired
 2016-01-27 08:03:00 -06:00
Firecage
d034a3f8ab Compile fix 2016-01-27 13:30:46 +02:00
Firecage
7f96592b87 Merge Conflict Fix 2016-01-27 13:29:38 +02:00
Jordie0608
30c5ab037b removes unnecessary file() 2016-01-27 22:18:38 +11:00
Jordie0608
579ff0428e fixes date change failing log ftp 2016-01-27 21:48:41 +11:00
KorPhaeron
78a0df6b42 Mispelled a var name 2016-01-27 03:42:20 -06:00
KorPhaeron
578295cc6d Fixes spawn protection 2016-01-27 03:34:50 -06:00
Bjorn Neergaard
d9162b653c Fix tgui recursion being broken 
..() is more elegant after all... You win @RemieRichards
Fixes #14925
 2016-01-27 00:52:22 -06:00
Razharas
41a9a90947 Merge pull request #14921 from MrPerson/hud_garbage_collection 
Make /datum/hud garbage collect correctly
 2016-01-27 07:19:42 +03:00
Incoming
7eaca93499 Poly is now more impressionable from things he hears in person (in parrot) and will mimic the line 50% of the time (up from 20%) 
Poly is now less impressionable from things he hears over the radio (the parrot) and will mimic the line 5% of the time (down from 20%)

Expands Poly's memory from 20 lines to 500 lines.
 2016-01-26 22:36:15 -05:00
duncathan salt
2a0b89c951 Update cleanbot.dm 2016-01-26 20:33:33 -06:00
Razharas
95bdba5ef9 Merge pull request #14912 from ChangelingRain/comment 
Blobs now have an animation when attacking a target
 2016-01-27 05:16:53 +03:00
KorPhaeron
74db42953b Fixes victory 2016-01-26 19:28:12 -06:00
Razharas
d110b5fc59 Merge pull request #14882 from ChangelingRain/superfailed 
Actually fixes supermatter explosion to not be capped
 2016-01-27 04:16:20 +03:00
Razharas
e67012ef41 Merge pull request #14773 from ChangelingRain/punchy 
Nerfs golem punch stun chances
 2016-01-27 04:09:14 +03:00
Razharas
d240bb49ef Merge pull request #14900 from KorPhaeron/mosin 
Adds dirt cheap surplus rifles to the nuke op uplink
 2016-01-27 04:05:11 +03:00
Razharas
3325776591 Merge pull request #14902 from neersighted/fun_removal 
Resolve wire issues and remove difficult colors
 2016-01-27 04:02:52 +03:00
KorPhaeron
c4f912d5cc Fixes team protection/scoring etc 2016-01-26 18:38:38 -06:00
Bjorn Neergaard
fb309f862d Add feedback to uplink/uplink_item 
A 'while I'm in here' thing
 2016-01-26 18:22:02 -06:00
PKPenguin321
8672ac3bca Merge branch 'master' of https://github.com/tgstation/-tg-station into autoimplanter 
# Conflicts:
#	icons/obj/device.dmi
 2016-01-26 16:06:39 -08:00
Bjorn Neergaard
12784269e5 Fix random telecrystals and surplus crate runtime 2016-01-26 17:57:11 -06:00
Bjorn Neergaard
7dcdda8ed0 Disable tgui autoupdate for uplinks 
Only a single person can use one at any given moment, and no
external factors update them
 2016-01-26 17:46:03 -06:00
Bjorn Neergaard
4fd5c1a9ed Fix random item in the uplink 2016-01-26 17:17:02 -06:00
Bjorn Neergaard
838dd15e95 Fix syndie surplus crates 2016-01-26 17:14:05 -06:00
Bjorn Neergaard
194ab5b264 Remove unused mapping verb 2016-01-26 15:11:41 -06:00
Bjorn Neergaard
d0f57701d9 Remove old define 2016-01-26 14:07:17 -06:00
Razharas
0486246927 Merge branch 'master' of https://github.com/tgstation/-tg-station into Assembly 2016-01-26 21:19:36 +03:00
Razharas
20bcee4ec0 Further impovements to proximity code 
Further impovements to proximity code
Also voice analiser's third mode now remembers the voice properly not
just mob
 2016-01-26 21:18:48 +03:00
duncathan salt
7c76c0ddbb Merge pull request #14887 from neersighted/Byond509 
Byond509
 2016-01-26 01:57:42 -06:00
duncathan salt
8fd2393dd7 Merge pull request #14890 from KorPhaeron/capture_the_flag_revival 
Adds capture the flag to Z2
 2016-01-26 00:34:17 -06:00
KorPhaeron
92f2c149cd Adds blue beacon sprite 2016-01-26 00:13:41 -06:00