cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-25 08:34:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,700 Commits 61 Branches 14 Tags
4c7cbeff080c0b7b3cc709349fca20d3557cc84f
Commit Graph

9365 Commits

Author SHA1 Message Date
VistaPOWA
4c7cbeff08 Fixes bad indent 2014-04-27 14:34:52 +02:00
VistaPOWA
14ad291ba2 Merge remote-tracking branch 'upstream/master' into smoke_fade 2014-04-27 14:16:55 +02:00
VistaPOWA
5a197e8dec Adds a fancy fade-out for smokes 
Originally from Bay.
Made by Loganbacca, ported by me.
 2014-04-27 14:16:50 +02:00
Alex
7abac87bf0 Merge pull request #3527 from Ikarrus/idcompfix 
You can log into ID computers with only access_change_ids again
 2014-04-27 12:55:00 +01:00
Cheridan
0ee6e26303 Merge pull request #3483 from Razharas/ExpVineFix 
Vines fixing general
 2014-04-26 22:38:00 -05:00
Cheridan
7cab7a8e86 Merge pull request #3533 from Menshin/solar_tracking_fix 
Fixes Solar Control Computer direction being erased in auto tracking (fix #3528)
 2014-04-26 20:46:32 -05:00
Razharas
af38938d28 Merge branch 'master' of https://github.com/tgstation/-tg-station into ExpVineFix 2014-04-26 20:57:02 +04:00
Razharas
67671c5af7 Fixed grammer and new light mutation 
Yep
 2014-04-26 20:56:47 +04:00
Menshin
5814668d52 Fixed a faulty call to Solar Control Computer /tracker_update which could erase the set direction (fix #3528). 2014-04-25 22:47:43 +02:00
Cheridan
31d04d3328 Merge pull request #3410 from Donkie/cellcharger 
Cellcharger update
 2014-04-24 23:53:44 -05:00
ikarrus
591ce37f4f You can log into ID computers with only access_change_ids again 
It wasn't very intuitive for players who thought access_change_ids was enough to use the computer. HoPs should rest easy now.
 2014-04-24 22:41:53 -06:00
Cheridan
94356c6937 Merge pull request #3277 from Aranclanos/StarsHTML 
the stars() proc will now use the html_decode()
 2014-04-24 23:35:09 -05:00
Cheridan
a081d487f7 Merge pull request #3424 from Nnelg/Polymorphic-can_equip 
Polymorphic can_equip
 2014-04-24 23:13:58 -05:00
Cheridan
686e879f2e Merge pull request #3490 from Giacom/fixes_transit_tubes 
Fixes transit tubes being stuck, it uses process() instead of a spawn'd loop.
 2014-04-24 23:07:52 -05:00
Cheridan
d45223f1a4 Merge pull request #3473 from Giacom/gotta_fix_em_all 
Fixes the ID computer exploit, to bypass the cooldown.
 2014-04-24 21:08:06 -05:00
Cheridan
892cf5b191 Merge pull request #3505 from MrPerson/who_cleans_those_who_clean_us 
Runtime fix for the mop
 2014-04-24 20:48:52 -05:00
MrPerson
55c6ce5b04 Merge pull request #3512 from phil235/ClumsilyMsgFix 
Fix for typo in machinery message
 2014-04-24 15:54:07 -07:00
Razharas
13053de7ef Less magic numbers in equasions, also tiny buff 2014-04-24 23:44:10 +04:00
Razharas
2cbb5a4dcb Merge branch 'master' of https://github.com/tgstation/-tg-station into ExpVineFix 2014-04-24 23:33:07 +04:00
Razharas
730b96936e Fixed possible runtimes and colour twerking 2014-04-24 23:32:43 +04:00
Cheridan
8cd176c484 Merge pull request #3511 from phil235/CondensedCapsaicinFix 
Fix  condensed capsaicin reagent never disappearing from mob.
 2014-04-24 12:37:16 -05:00
Aranclanos
09095d3036 Merge pull request #3518 from Aranclanos/ServerCrash 
Server crash fix.
 2014-04-24 02:18:10 -03:00
MrPerson
d56e0c6d04 var rename. Gia's right, this was kinda confusing 2014-04-23 15:11:59 -07:00
Cheridan
22d6100c2e Merge pull request #3487 from Nerolat/halltweek 
Nerfed hallucination sting
 2014-04-23 12:58:30 -05:00
phil235
ca5bfe266a Fix clumsily machinery message 2014-04-23 19:18:28 +02:00
phil235
0f3d6d10be Fix the condensed capsaicin never disappearing from mob. 2014-04-23 18:53:42 +02:00
fleure
579b705f24 Merge pull request #3492 from Firecage/master 
Roboticist on Preference screen Fixes #1145
 2014-04-23 16:44:11 +01:00
fleure
7539e59679 Merge pull request #3497 from phil235/AlienMonkeyAtkMsgFix 
Partial fix for #1344
 2014-04-23 15:16:56 +01:00
fleure
6f341016dd Merge pull request #3494 from phil235/MedbotRedmsgFix 
medbot injection message now only bold red for target.
 2014-04-23 15:14:13 +01:00
fleure
a3b01d017e Merge pull request #3495 from phil235/CocoonattackedmsgFix 
Fix for #3151
 2014-04-23 15:12:38 +01:00
fleure
4a0d59e81c Merge pull request #3485 from Nerolat/cyborgcult 
Doesn't announce that a player was de-culted or de-reved after making them a silicon. Fixes #3351
 2014-04-23 15:09:47 +01:00
fleure
7d9e758c9f Merge pull request #3467 from MrPerson/grabby_patties 
Make grabs GC, fix a grab related runtime
 2014-04-23 14:57:02 +01:00
fleure
47a23e1465 Merge pull request #3456 from phil235/TrayPinMsgFix 
Fixing rolling pin/tray attack stuff
 2014-04-23 14:52:58 +01:00
Aranclanos
1f74292923 Fixes a server crash due to infinite loops related to atmos unary machines interacting with eachother. 2014-04-23 02:10:03 -03:00
MrPerson
e12a567000 Merge pull request #3484 from VistaPOWA/pr_announce_security 
Security fixes for PR announcer
 2014-04-22 15:17:07 -07:00
MrPerson
2841124d29 Runtime fix for the mop 
The following runtime has occured 40 time(s).
runtime error: Cannot execute null.clean blood().
proc name: clean (/obj/item/weapon/mop/proc/clean)
  source file: mop.dm,22
  usr: Xavier Paynter (/mob/living/carbon/human)
  src: the mop (/obj/item/weapon/mop)

Cause: Someone would mop the same vomit/whatever more than once. The first clean would qdel() the vomit, which resulted in the vomit's loc being null. The subsequent moppings would continue and eventually try to call vomit.loc.clean_blood().
 2014-04-22 12:52:33 -07:00
Razharas
b6ca0139cb No logging for explosive bullshit 2014-04-22 19:04:10 +04:00
Razharas
603c72549b Fixes goats not eating vines 
Yep it was a bug
 2014-04-22 13:14:53 +04:00
Razharas
ae2e0cd929 Merge branch 'master' of https://github.com/tgstation/-tg-station into ExpVineFix 2014-04-22 12:57:45 +04:00
Razharas
f5c66b3bda Fixis colouring, forgot some of the #s 
Yep
 2014-04-22 12:57:28 +04:00
Cheridan
b441e34d14 Merge pull request #3390 from Ikarrus/deptmanagement 
Heads may use ID Modification Consoles to manage their department
 2014-04-21 22:51:57 -05:00
Cheridan
df8b266d38 Merge pull request #3445 from Incoming5643/magicmania1.6 
Magic Mania 1.6: Baby's Day Out
 2014-04-21 22:30:34 -05:00
Cheridan
f042b62182 Merge pull request #3468 from Giacom/revision_open_browser 
The links in the "show server revision" menu will now open in the user's default browser...
 2014-04-21 22:26:22 -05:00
Cheridan
c3a3d00f82 Merge pull request #3470 from Giacom/default_wiki 
Changed the default wiki to tgstation13.org/wiki.
 2014-04-21 21:56:52 -05:00
Cheridan
fd62e88d6f Merge pull request #3448 from Ikarrus/lingchatlog 
[Admin] Added logging for changeling hivemind chat
 2014-04-21 21:55:19 -05:00
Incoming
be8671fcf9 Merge branch 'master' of https://github.com/tgstation/-tg-station into magicmania1.6 
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
 2014-04-21 19:00:04 -04:00
phil235
d12238db57 adding missing comma 2014-04-21 22:01:20 +02:00
Giacomand
d42aa1e28a Fixes a typo. 2014-04-21 21:00:23 +01:00
phil235
0a4cc4a35e Monkey third party attack no longer bolded 2014-04-21 21:33:53 +02:00
phil235
fccf892445 Alien third party attack no longer bolded. 2014-04-21 21:30:41 +02:00